From: Holger Levsen <holger@layer-acht.org>
Date: Sat, 17 Sep 2011 16:46:52 +0000 (+0200)
Subject: fix logic
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=207137a5c9b274ff47cbcc31c2422a4fa747067f;p=profitbricks%2Fjenkins-build-scripts.git

fix logic
---

diff --git a/debian_build.py b/debian_build.py
index 9b51263..b412be1 100755
--- a/debian_build.py
+++ b/debian_build.py
@@ -422,9 +422,9 @@ if __name__ == '__main__':
         distribution = grep_dctrl.stdout.readline()
         distribution = distribution.strip()
         logger.info('Packet 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 distribution in ('stable', 'stable-proposed-updates', 'production', 'production-proposed-updates')):
+        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')):
             raise Exception(
-                    'Distribution %s in debian/changelog did not match branch %s' % (distribution, GIT_UPSTREAM_BRANCH)
+                    'Distribution %s in debian/changelog did not match branch %s' % (distribution, options.distribution)
             )
             exit_error()