From: Holger Levsen Date: Wed, 28 Sep 2011 15:07:17 +0000 (+0200) Subject: we only care for correct changelog for master+hotfix/* X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=84236910698e0ca51dea06be2e18f981013b52b7;p=profitbricks%2Fjenkins-build-scripts.git we only care for correct changelog for master+hotfix/* --- diff --git a/debian_build.py b/debian_build.py index 72d2eae..afeda70 100755 --- a/debian_build.py +++ b/debian_build.py @@ -369,7 +369,7 @@ if __name__ == '__main__': distribution = distribution.strip() logger.info('Package distribution is %s' % (distribution)) - if (options.distribution in ('testing', 'staging') and not distribution in ('testing', 'staging')) or (options.distribution in ('stable', 'stable-proposed-updates', 'production', 'production-proposed-updates') and not distribution in ('stable', 'stable-proposed-updates', 'production', 'production-proposed-updates')) or (options.distribution in ('unstable', 'pre-staging') and not distribution in ('unstable', 'pre-staging', 'UNRELEASED')): + if (options.distribution in ('stable', 'stable-proposed-updates', 'production', 'production-proposed-updates') and not distribution in ('stable', 'stable-proposed-updates', 'production', 'production-proposed-updates')): logger_loud_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)