1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/a722c37dee3f/ changeset: a722c37dee3f user: dan date: 2012-05-09 21:36:15 summary: Fix for clearing implicitly converted dataset association when converted dataset is deleted. affected #: 1 file
diff -r 17d57db9a7c04467dbd82eaa66027e3fa5e38bc2 -r a722c37dee3fb167c47c6f4b93e74518237f7d28 lib/galaxy/model/__init__.py --- a/lib/galaxy/model/__init__.py +++ b/lib/galaxy/model/__init__.py @@ -1126,8 +1126,10 @@ def clear_associated_files( self, metadata_safe = False, purge = False ): # metadata_safe = True means to only clear when assoc.metadata_safe == False for assoc in self.implicitly_converted_datasets: - if not metadata_safe or not assoc.metadata_safe: + if not assoc.deleted and ( not metadata_safe or not assoc.metadata_safe ): assoc.clear( purge = purge ) + for assoc in self.implicitly_converted_parent_datasets: + assoc.clear( purge = purge, delete_dataset = False ) def get_display_name( self ): ## Name can be either a string or a unicode object. If string, convert to unicode object assuming 'utf-8' format. hda_name = self.name @@ -1626,12 +1628,14 @@ self.purged = purged self.metadata_safe = metadata_safe
- def clear( self, purge = False ): + def clear( self, purge = False, delete_dataset = True ): self.deleted = True if self.dataset: - self.dataset.deleted = True - self.dataset.purged = purge - if purge: #do something with purging + if delete_dataset: + self.dataset.deleted = True + if purge: + self.dataset.purged = True + if purge and self.dataset.deleted: #do something with purging self.purged = True try: os.unlink( self.file_name ) except Exception, e: print "Failed to purge associated file (%s) from disk: %s" % ( self.file_name, e )
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.