Merge branch 'master' into unstable

9 years ago · 57f5e7a7d9
parent c3c6b29854 6b70fa9794
commit 57f5e7a7d9
1 changed files with 3 additions and 2 deletions
--- a/gns3server/handlers/upload_handler.py
+++ b/gns3server/handlers/upload_handler.py
@ -36,8 +36,9 @@ class UploadHandler:
        try:
            for root, _, files in os.walk(UploadHandler.image_directory()):
                for filename in files:
-                    image_file = os.path.join(root, filename)
-                    uploaded_files.append(image_file)
+                    if not filename.startswith("."):
+                        image_file = os.path.join(root, filename)
+                        uploaded_files.append(image_file)
        except OSError:
            pass
        iourc_path = os.path.join(os.path.expanduser("~/"), ".iourc")