From b1cbd6e7a320c226ce187bf7a94e38edf842645b Mon Sep 17 00:00:00 2001 From: Mathias Klette Date: Tue, 28 May 2013 18:07:57 +0200 Subject: [PATCH] debian_build: do not merge if we are on integration already --- debian_build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian_build.py b/debian_build.py index ba13a65..754ce52 100755 --- a/debian_build.py +++ b/debian_build.py @@ -333,7 +333,7 @@ if __name__ == '__main__': # .. do some CI magic now, if requested if do_triggers: - if 'merge' in commit_triggers: + if 'merge' in commit_triggers and local_branch != 'integration': if 'no-test' in commit_triggers: logger.info('Force building with tests as we also merge your branch.') commit_triggers.remove('no-test') -- 2.39.5