From: Mathias Klette <mathias.klette@profitbricks.com>
Date: Wed, 24 Apr 2013 18:33:07 +0000 (+0200)
Subject: update debian_build: fix the second (same) conversion error
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=84255a468a6d93ad1c55b51608a31f965d84a886;p=profitbricks%2Fjenkins-build-scripts.git

update debian_build: fix the second (same) conversion error

- define the string only once
- use this variable for both invokations then
---

diff --git a/debian_build.py b/debian_build.py
index 94d54fd..94689d5 100755
--- a/debian_build.py
+++ b/debian_build.py
@@ -418,15 +418,12 @@ 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:
-        logger.error(
-            'Distribution %s in debian/changelog not listed in %s' %(
+        message = 'Distribution %s in debian/changelog not listed in %s' %(
             distribution,
             allowed_production_distros
-            ))
-        raise Exception(
-            'Distribution %s in debian/changelog not listed in %s' %(
-            allowed_production_distros,
-            ))
+            )
+        logger.error(message)
+        raise Exception(message)
         exit_error()
 
     DPUT_OPTIONS = DPUT_OPTIONS_DEFAULT