enforce correct distribution in debian/changelog for master and hotfix branches

diff --git a/debian_build.py b/debian_build.py
index 2985243b2ab4435a8a34122db4fb1ee8cd7bfb5c..900e7a1652016681577c08b75c098214cbb7327e 100755 (executable)
--- 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)