From e31890fc33d8bb08b00b8622f11e99bb689efc25 Mon Sep 17 00:00:00 2001 From: Mathias Klette Date: Wed, 24 Apr 2013 20:33:07 +0200 Subject: [PATCH] update debian_build: fix the second (same) conversion error - define the string only once - use this variable for both invokations then --- debian_build.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) 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 -- 2.39.5