From ec425845444cee5c308687d3b6077c4c03c43e38 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Tue, 13 Mar 2012 16:07:47 +0100 Subject: [PATCH] enforce correct distribution in debian/changelog for master and hotfix branches --- debian_build.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian_build.py b/debian_build.py index 2985243..900e7a1 100755 --- a/debian_build.py +++ b/debian_build.py @@ -315,7 +315,8 @@ if __name__ == '__main__': distribution = distribution.strip() logger.info('Package distribution is %s' % (distribution)) - if (options.distribution in ('stable', 'stable-proposed-updates', 'production', 'production-proposed-updates') and not distribution in ('stable', 'stable-proposed-updates', 'production', 'production-proposed-updates')): + # enforce correct distribution in debian/changelog for master and hotfix branches + if (GIT_BRANCH_NAME == 'master' or GIT_BRANCH_NAME.startswith('hotfix/')) and not distribution in ('stable', 'stable-proposed-updates', 'production', 'production-proposed-updates'): logger_error('Distribution %s in debian/changelog did not match branch %s' % (distribution, options.distribution)) raise Exception( 'Distribution %s in debian/changelog did not match branch %s' % (distribution, options.distribution) -- 2.39.5