From 9bd4ab86a3cc20dc4429dfbeb62bbb358927be8e Mon Sep 17 00:00:00 2001 From: Greg Von Kuster Date: Tue, 8 Jan 2008 23:26:08 +0000 Subject: [PATCH] Set file_size to 0 when purging dataset. --- lib/galaxy/model/__init__.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py index a5c81eadfb6..16e087ae105 100644 --- a/lib/galaxy/model/__init__.py +++ b/lib/galaxy/model/__init__.py @@ -326,16 +326,22 @@ class Dataset( object ): """Removes the file contents from disk """ self.deleted = True self.purged = True + self.file_size = 0 if self.dataset_file is None or not self.dataset_file.readonly: #Check to see if another dataset is using this file if self.dataset_file: - for data in self.select_by(purged=False, filename_id=self.dataset_file.id): - if data.id != self.id: return + for data in self.select_by( purged=False, filename_id=self.dataset_file.id ): + if data.id != self.id: + return #Delete files - try: os.unlink(self.file_name) - except: pass - try: os.unlink(self.extra_files_path) - except: pass + try: + os.unlink( self.file_name ) + except: + pass + try: + os.unlink( self.extra_files_path ) + except: + pass def get_converter_types(self): return self.datatype.get_converter_types( self, datatypes_registry)