Merge tag 'v24.1.13'

aces · Oct 16, 2023 · f4e58f0 · f4e58f0
2 parents 3345abe + 69ff4c6
commit f4e58f0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-25.0.0
+24.1.13
diff --git a/python/extract_eeg_bids_archive.py b/python/extract_eeg_bids_archive.py
@@ -200,7 +200,7 @@ def main():
                         """
                         If the suject/session/modality BIDS data already exists
                         on the destination folder, delete it first
-                        copying the data
+                        before copying the data
                         """
                         s3_obj.delete_file(s3_data_eeg_modality_path)
 
@@ -222,7 +222,6 @@ def main():
                     copying the data
                     """
                     imaging_io_obj.remove_dir(data_eeg_modality_path)
-
                     imaging_io_obj.copy_file(tmp_eeg_modality_path, data_eeg_modality_path)
 
         # Delete tmp location

diff --git a/python/lib/aws_s3.py b/python/lib/aws_s3.py
@@ -80,7 +80,7 @@ def upload_dir(self, dir_name, s3_object_name, force = False):
 
         for (root, dirs, files) in os.walk(dir_name):
             for file in files:
-                s3_prefix = os.path.join(s3_file_name, root.replace(dir_name, ""), file)
+                s3_prefix = os.path.join(s3_file_name, root.replace(dir_name, "").lstrip('/'), file)
                 s3_dest = os.path.join(
                     's3://',
                     s3_bucket_name,