From 0d1b325f0f8dbcf385a10f0412bcd826d51ef15a Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Wed, 15 Feb 2012 16:21:30 +0100 Subject: [PATCH] louder --- debian_build.py | 6 +++--- hooks/default/bin/call_jenkins.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian_build.py b/debian_build.py index f2242fb..c7684d4 100755 --- a/debian_build.py +++ b/debian_build.py @@ -425,9 +425,9 @@ if __name__ == '__main__': elif GIT_BRANCH_NAME.startswith('hotfix/') or options.distribution in ('stable', 'stable-proposed-updates', 'production', 'production-proposed-updates'): pb_suite='production-proposed-updates' - cmd = ['toilet', '-E', 'caca', '-t', 'dist: %s' %(pb_suite)] + cmd = ['toilet', '-f', 'ascii9', '-t', 'dist: %s' %(pb_suite)] subprocess.check_call(cmd) - cmd = ['toilet', '-E', 'caca', '-t', 'version: %s' %(version)] + cmd = ['toilet', '-f', 'ascii9', '-t', 'version: %s' %(version)] subprocess.check_call(cmd) gbp = git_buildpackage.GitBuildPackage( @@ -477,7 +477,7 @@ if __name__ == '__main__': else: logger.debug('value of NO_UPLOAD: %s' % NO_UPLOAD) except Exception, error: - cmd = ['toilet', '-E', 'caca', '-t', 'upload to reprepro failed:'] + cmd = ['toilet', '-f', 'ascii9', '-t', 'upload to reprepro failed:'] subprocess.check_call(cmd) logger.exception(error) exit_error() diff --git a/hooks/default/bin/call_jenkins.py b/hooks/default/bin/call_jenkins.py index 8625dcf..96c7b4e 100755 --- a/hooks/default/bin/call_jenkins.py +++ b/hooks/default/bin/call_jenkins.py @@ -109,7 +109,7 @@ if __name__ == '__main__': job_prefix='' # choose distribution based on branch - if git_branch_name == 'master' or git_branch_name.startswith('release/') or git_branch_name.startswith('hotfix/'): + if git_branch_name == 'master' or git_branch_name.startswith('hotfix/'): distribution='production-proposed-updates' elif git_branch_name == 'experimental' or git_branch_name.startswith('feature/') or git_branch_name.startswith('poc/') or git_branch_name.startswith('bugfix/') : #distribution='dev_'+ git_branch_name.replace("/","_") -- 2.39.5