Merge pull request #4268 from cche/cche-import-hist-withsubdir

Importing old exported histories failing
galaxyproject · Jul 12, 2017 · 641a268 · 641a268
2 parents db486b5 + 8a309ce
commit 641a268
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/lib/galaxy/tools/imp_exp/__init__.py b/lib/galaxy/tools/imp_exp/__init__.py
@@ -71,6 +71,13 @@ def get_tag_str( tag, value ):
                 archive_dir = jiha.archive_dir
                 user = jiha.job.user
 
+                # Bioblend previous to 17.01 exported histories with an extra subdir.
+                if not os.path.exists( os.path.join( archive_dir, 'history_attrs.txt' ) ):
+                    for d in os.listdir( archive_dir ):
+                        if os.path.isdir( os.path.join( archive_dir, d ) ):
+                            archive_dir = os.path.join( archive_dir, d )
+                            break
+
                 #
                 # Create history.
                 #