debian_build: do not merge if we are on integration already

diff --git a/debian_build.py b/debian_build.py
index ba13a6521ace06289daef6ca7dc08b6cf1ae6498..754ce52a9effe99c9caa3d2903a8010ab94d4a5c 100755 (executable)
--- 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')