Merge branch 'master' into develop

arcsecond-io · May 6, 2020 · 669a1d4 · 669a1d4
2 parents 50ecd23 + 16e0e80
commit 669a1d4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/oort/__init__.py b/oort/__init__.py
@@ -1,3 +1,3 @@
 name = 'oort'
 
-__version__ = '0.6.4'
+__version__ = '0.6.5'
diff --git a/oort/app/helpers/fileuploader.py b/oort/app/helpers/fileuploader.py
@@ -71,6 +71,7 @@ def exists_remotely(self):
         response_list, error = self.api.list(name=filename)
         if error:
             print(error)
+            return
 
         if isinstance(response_list, dict) and 'count' in response_list.keys() and 'results' in response_list.keys():
             response_list = response_list['results']
@@ -80,9 +81,9 @@ def exists_remotely(self):
         elif len(response_list) == 1:
             self._exists_remotely = 'amazonaws.com' in response_list[0].get('file', '')
             return self._exists_remotely
-        else:
+        elif len(response_list) > 1:
             print(f'Multiple files for dataset {self.dataset["uuid"]} and filename {filename}???')
-            return False
+            return True
 
     def prepare(self, dataset, night_log, telescope):
         if not dataset or not dataset['uuid']: