diff --git a/cadetrdm/repositories.py b/cadetrdm/repositories.py index c1551c63755b5967cf5fd741a8d25c84d4b9eddc..6ae61b8ac5b0eae577d7715d7f153ee282472dbd 100644 --- a/cadetrdm/repositories.py +++ b/cadetrdm/repositories.py @@ -133,12 +133,11 @@ class BaseRepo: f"{[branch.name for branch in correct_remote_branches]}") remote_hash = str(correct_remote_branches[0].commit) - if self.current_commit_hash != remote_hash: - if remote_hash in self.log: - raise RuntimeError( - "Local repository is ahead of remote. This could be due to CADET-RDM version updates" - ) + if self.current_commit_hash != remote_hash and remote_hash not in self.log: return True + elif self.current_commit_hash != remote_hash and remote_hash in self.log: + print("Local repository is ahead of remote. This could be due to CADET-RDM version updates.") + return False else: return False diff --git a/examples/example_for_runner.py b/examples/example_for_runner.py index 63949a5595c8dd6fde5608a9ec155566d1ba9f7f..1e885116fcd1001aa9b6b8ad13a1c9a4d560d9c3 100644 --- a/examples/example_for_runner.py +++ b/examples/example_for_runner.py @@ -13,36 +13,36 @@ if __name__ == '__main__': "git@jugit.fz-juelich.de:r.jaepel/puetmann2013.git", ) - clr = Study( - WORK_DIR / 'clr', - "git@jugit.fz-juelich.de:j.schmoelder/clr.git", - branch="adapt_to_cadetrdm_runner" - ) - - flip_flow = Study( - WORK_DIR / 'flip_flow', - "git@jugit.fz-juelich.de:j.schmoelder/flip_flow.git", - branch="adapt_to_cadetrdm_runner" - ) - - serial_columns = Study( - WORK_DIR / 'serial_columns', - "git@jugit.fz-juelich.de:j.schmoelder/serial_columns.git", - # branch="adapt_to_cadetrdm_runner" - ) - - smb = Study( - WORK_DIR / 'smb', - "git@jugit.fz-juelich.de:j.schmoelder/smb.git", - # branch="adapt_to_cadetrdm_runner" - ) + # clr = Study( + # WORK_DIR / 'clr', + # "git@jugit.fz-juelich.de:j.schmoelder/clr.git", + # branch="adapt_to_cadetrdm_runner" + # ) + # + # flip_flow = Study( + # WORK_DIR / 'flip_flow', + # "git@jugit.fz-juelich.de:j.schmoelder/flip_flow.git", + # branch="adapt_to_cadetrdm_runner" + # ) + # + # serial_columns = Study( + # WORK_DIR / 'serial_columns', + # "git@jugit.fz-juelich.de:j.schmoelder/serial_columns.git", + # # branch="adapt_to_cadetrdm_runner" + # ) + # + # smb = Study( + # WORK_DIR / 'smb', + # "git@jugit.fz-juelich.de:j.schmoelder/smb.git", + # # branch="adapt_to_cadetrdm_runner" + # ) studies = [ - # puetmann2013, + puetmann2013, # clr, # flip_flow, # serial_columns, - smb, + # smb, ] force = False