2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/8e2fab723bca/ Changeset: 8e2fab723bca Branch: next-stable User: dan Date: 2014-02-05 19:44:32 Summary: Update GenomeSpace import tools to use current working directory instead of __new_file_path__ for extrafiles created using multiple outputs technique. Should resolve issue on our public servers where only the first selected file was being imported to the history. Affected #: 2 files diff -r c77d83fe4c3e37d07c241bb1f76064a3d0b7f149 -r 8e2fab723bca8ce5eac70d1bef2cb127897eae81 tools/genomespace/genomespace_file_browser.py --- a/tools/genomespace/genomespace_file_browser.py +++ b/tools/genomespace/genomespace_file_browser.py @@ -166,7 +166,7 @@ while filename in used_filenames: filename = "-%s" % filename used_filenames.append( filename ) - output_filename = os.path.join( datasource_params['__new_file_path__'], 'primary_%i_%s_visible_%s' % ( hda_id, filename, galaxy_ext ) ) + output_filename = os.path.join( os.getcwd(), 'primary_%i_%s_visible_%s' % ( hda_id, filename, galaxy_ext ) ) metadata_dict = dict( type = 'new_primary_dataset', base_dataset_id = dataset_id, diff -r c77d83fe4c3e37d07c241bb1f76064a3d0b7f149 -r 8e2fab723bca8ce5eac70d1bef2cb127897eae81 tools/genomespace/genomespace_importer.py --- a/tools/genomespace/genomespace_importer.py +++ b/tools/genomespace/genomespace_importer.py @@ -189,7 +189,7 @@ while filename in used_filenames: filename = "-%s" % filename used_filenames.append( filename ) - target_output_filename = os.path.join( datasource_params['__new_file_path__'], 'primary_%i_%s_visible_%s' % ( hda_id, filename, file_type ) ) + target_output_filename = os.path.join( os.getcwd(), 'primary_%i_%s_visible_%s' % ( hda_id, filename, file_type ) ) shutil.move( output_filename, target_output_filename ) metadata_parameter_file.write( "%s\n" % json.dumps( dict( type = 'new_primary_dataset', base_dataset_id = base_dataset_id, https://bitbucket.org/galaxy/galaxy-central/commits/58f73c96431b/ Changeset: 58f73c96431b User: dan Date: 2014-02-05 19:44:32 Summary: Update GenomeSpace import tools to use current working directory instead of __new_file_path__ for extrafiles created using multiple outputs technique. Should resolve issue on our public servers where only the first selected file was being imported to the history. Affected #: 2 files diff -r 47990c9bd4d8003e0ba619d73c1022646f3bc973 -r 58f73c96431bdd701c0bdf656d0f0f0d14c456e4 tools/genomespace/genomespace_file_browser.py --- a/tools/genomespace/genomespace_file_browser.py +++ b/tools/genomespace/genomespace_file_browser.py @@ -166,7 +166,7 @@ while filename in used_filenames: filename = "-%s" % filename used_filenames.append( filename ) - output_filename = os.path.join( datasource_params['__new_file_path__'], 'primary_%i_%s_visible_%s' % ( hda_id, filename, galaxy_ext ) ) + output_filename = os.path.join( os.getcwd(), 'primary_%i_%s_visible_%s' % ( hda_id, filename, galaxy_ext ) ) metadata_dict = dict( type = 'new_primary_dataset', base_dataset_id = dataset_id, diff -r 47990c9bd4d8003e0ba619d73c1022646f3bc973 -r 58f73c96431bdd701c0bdf656d0f0f0d14c456e4 tools/genomespace/genomespace_importer.py --- a/tools/genomespace/genomespace_importer.py +++ b/tools/genomespace/genomespace_importer.py @@ -189,7 +189,7 @@ while filename in used_filenames: filename = "-%s" % filename used_filenames.append( filename ) - target_output_filename = os.path.join( datasource_params['__new_file_path__'], 'primary_%i_%s_visible_%s' % ( hda_id, filename, file_type ) ) + target_output_filename = os.path.join( os.getcwd(), 'primary_%i_%s_visible_%s' % ( hda_id, filename, file_type ) ) shutil.move( output_filename, target_output_filename ) metadata_parameter_file.write( "%s\n" % json.dumps( dict( type = 'new_primary_dataset', base_dataset_id = base_dataset_id, Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.