2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/3d030de0c470/ Changeset: 3d030de0c470 User: dannon Date: 2014-10-17 12:07:24+00:00 Summary: Merge stable. Affected #: 3 files diff -r 0e8235a516d16724fbe1ba2dababb18f4b53c6ef -r 3d030de0c4708214f7add0c6391e0bd9024c045a .hgtags --- a/.hgtags +++ b/.hgtags @@ -20,4 +20,4 @@ ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11 548ab24667d6206780237bd807f7d857a484c461 latest_2014.08.11 2092948937ac30ef82f71463a235c66d34987088 release_2014.10.06 -cb0c2ea402e4c82c7872177e874ce59de29c9c13 latest_2014.10.06 +e1404e285ccb9e52bd09c5827934cd0da1974acc latest_2014.10.06 diff -r 0e8235a516d16724fbe1ba2dababb18f4b53c6ef -r 3d030de0c4708214f7add0c6391e0bd9024c045a lib/galaxy/model/__init__.py --- a/lib/galaxy/model/__init__.py +++ b/lib/galaxy/model/__init__.py @@ -1336,6 +1336,7 @@ self.purged = False self.purgable = purgable self.external_filename = external_filename + self.external_extra_files_path = None self._extra_files_path = extra_files_path self.file_size = file_size if uuid is None: @@ -1359,9 +1360,20 @@ else: self.external_filename = filename file_name = property( get_file_name, set_file_name ) - @property - def extra_files_path( self ): - return self.object_store.get_filename( self, dir_only=True, extra_dir=self._extra_files_path or "dataset_%d_files" % self.id ) + def get_extra_files_path( self ): + # Unlike get_file_name - extrnal_extra_files_path is not backed by an + # actual database column so if SA instantiates this object - the + # attribute won't exist yet. + if not getattr( self, "external_extra_files_path", None ): + return self.object_store.get_filename( self, dir_only=True, extra_dir=self._extra_files_path or "dataset_%d_files" % self.id ) + else: + return os.path.abspath( self.external_extra_files_path ) + def set_extra_files_path( self, extra_files_path ): + if not extra_files_path: + self.external_extra_files_path = None + else: + self.external_extra_files_path = extra_files_path + extra_files_path = property( get_extra_files_path, set_extra_files_path) def _calculate_size( self ): if self.external_filename: try: diff -r 0e8235a516d16724fbe1ba2dababb18f4b53c6ef -r 3d030de0c4708214f7add0c6391e0bd9024c045a scripts/set_metadata.py --- a/scripts/set_metadata.py +++ b/scripts/set_metadata.py @@ -110,6 +110,8 @@ dataset = cPickle.load( open( filename_in ) ) # load DatasetInstance if dataset_filename_override: dataset.dataset.external_filename = dataset_filename_override + files_path = os.path.abspath(os.path.join( tool_job_working_directory, "dataset_%s_files" % (dataset.dataset.id) )) + dataset.dataset.external_extra_files_path = files_path if dataset.dataset.id in existing_job_metadata_dict: dataset.extension = existing_job_metadata_dict[ dataset.dataset.id ].get( 'ext', dataset.extension ) # Metadata FileParameter types may not be writable on a cluster node, and are therefore temporarily substituted with MetadataTempFiles https://bitbucket.org/galaxy/galaxy-central/commits/acb838d9af91/ Changeset: acb838d9af91 User: dannon Date: 2014-10-17 12:08:08+00:00 Summary: Fix typo noticed by nsoranzo. Affected #: 1 file diff -r 3d030de0c4708214f7add0c6391e0bd9024c045a -r acb838d9af911cfc7c79328ffa87472913e5529c lib/galaxy/model/__init__.py --- a/lib/galaxy/model/__init__.py +++ b/lib/galaxy/model/__init__.py @@ -1361,7 +1361,7 @@ self.external_filename = filename file_name = property( get_file_name, set_file_name ) def get_extra_files_path( self ): - # Unlike get_file_name - extrnal_extra_files_path is not backed by an + # Unlike get_file_name - external_extra_files_path is not backed by an # actual database column so if SA instantiates this object - the # attribute won't exist yet. if not getattr( self, "external_extra_files_path", None ): @@ -2449,7 +2449,7 @@ file_size = int( ldda.get_size() ) except OSError: file_size = 0 - + rval = dict( id = ldda.id, hda_ldda = 'ldda', model_class = self.__class__.__name__, 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.