# HG changeset patch # User greg # Date 1526998215 14400 # Node ID 7973201f23e753a7102d8fb8bd152ee46aa8c21d # Parent f2e91be20b437fa9f493367c2b35c77a8145f4b5 Uploaded diff -r f2e91be20b43 -r 7973201f23e7 add_scaffold.py --- a/add_scaffold.py Tue May 22 10:06:28 2018 -0400 +++ b/add_scaffold.py Tue May 22 10:10:15 2018 -0400 @@ -64,7 +64,8 @@ self.stop_err(msg) return cur - def check_scaffold(self): + @property + def can_add_scaffold(self): """ Make sure the scaffold has not already been added. """ @@ -75,17 +76,18 @@ try: cur.fetchone()[0] self.stop_err("The scaffold %s has already been added to the database." % scaffold_id) + return False except: # The scaffold has not yet been added. - pass + return True def run(self): - self.check_scaffold() - self.process_annot_dir() - self.process_scaffold_config_files() - self.process_orthogroup_fasta_files() - self.fh.flush() - self.fh.close() + if self.can_add_scaffold: + self.process_annot_dir() + self.process_scaffold_config_files() + self.process_orthogroup_fasta_files() + self.fh.flush() + self.fh.close() def process_annot_dir(self): """