From: Holger Levsen Date: Wed, 28 Sep 2011 14:39:15 +0000 (+0200) Subject: bah X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=de8dfe858f367497f2b0c6fd42590c7b432160aa;p=profitbricks%2Fjenkins-build-scripts.git bah --- diff --git a/debian_build.py b/debian_build.py index f872856..f0e24df 100755 --- a/debian_build.py +++ b/debian_build.py @@ -369,9 +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 ('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')): 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)