Merge branch 'development'

Team-Neptune · Feb 3, 2021 · 4c4f80e · 4c4f80e
2 parents f6f6066 + bdc1603
commit 4c4f80e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -1,4 +1,4 @@
 {
-    "buildVersion": "2.0.1",
+    "buildVersion": "2.0.2",
     "buildPackages": ["normal", "minimal"]
 }
diff --git a/modules/basemodule.py b/modules/basemodule.py
@@ -87,7 +87,11 @@ def removeFile(self, filepath):
             os.remove(filepath)
 
     def findAndRemove(self, filename):
-        if self.__module__ != "modules.atmosphere" or self.__module__ != "modules.ovlloader":
+        if self.__module__ == "modules.atmosphere":
+            pass
+        elif self.__module__ == "modules.ovlloader": 
+            pass
+        else:
             search = Path.joinpath(self.workspaceFullPath, "**", filename)
             fileList = glob.glob(str(search), recursive=True)
             for filePath in fileList:
@@ -96,6 +100,7 @@ def findAndRemove(self, filename):
                 except:
                     pass
 
+
     def copyFolderContentToPackage(self, source_dir, target_dir=""):
         if source_dir is None:
             return None