louder

diff --git a/debian_build.py b/debian_build.py
index f2242fbd1528ad63bbe98915de38acf6ca784e55..c7684d4b70ac1eca3a9333bfe9f7a42f23ad2fca 100755 (executable)
--- 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 8625dcf876617d5c557a7d7763cff75492d79001..96c7b4ef0b764ec32d139f44dcf9c935ad682713 100755 (executable)
--- 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("/","_")