]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
update debian_build: fix convertion error in exception messages
authorMathias Klette <mathias.klette@profitbricks.com>
Wed, 24 Apr 2013 18:28:59 +0000 (20:28 +0200)
committerMathias Klette <mathias.klette@profitbricks.com>
Tue, 30 Apr 2013 15:37:42 +0000 (17:37 +0200)
Conflicts:
debian_build.py

debian_build.py

index 94689d50873e4ae291cce378d4bf8226e87c3bf7..94d54fda0ef582df965b719ba348ca3c2afe61d6 100755 (executable)
@@ -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