From: Mathias Klette <mathias.klette@profitbricks.com>
Date: Wed, 24 Apr 2013 18:28:59 +0000 (+0200)
Subject: update debian_build: fix convertion error in exception messages
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=68eee02c5473a5619b402b00d85f6a51bce78ab1;p=profitbricks%2Fjenkins-build-scripts.git

update debian_build: fix convertion error in exception messages

Conflicts:
	debian_build.py
---

diff --git a/debian_build.py b/debian_build.py
index 94689d5..94d54fd 100755
--- a/debian_build.py
+++ b/debian_build.py
@@ -418,12 +418,15 @@ if __name__ == '__main__':
     # enforce correct distribution in debian/changelog for master and hotfix branches
     allowed_production_distros=('stable', 'stable-proposed-updates', 'production', 'production-proposed-updates')
     if (GIT_BRANCH_NAME == 'master' or GIT_BRANCH_NAME.startswith('hotfix/')) and not distribution in allowed_production_distros:
-        message = 'Distribution %s in debian/changelog not listed in %s' %(
+        logger.error(
+            'Distribution %s in debian/changelog not listed in %s' %(
             distribution,
             allowed_production_distros
-            )
-        logger.error(message)
-        raise Exception(message)
+            ))
+        raise Exception(
+            'Distribution %s in debian/changelog not listed in %s' %(
+            allowed_production_distros,
+            ))
         exit_error()
 
     DPUT_OPTIONS = DPUT_OPTIONS_DEFAULT