From: Mathias Klette <mathias.klette@profitbricks.com>
Date: Wed, 5 Jun 2013 17:47:34 +0000 (+0200)
Subject: debian_build: change help instructions to be copy&pasteble
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=d8b94973ff45f1e77f97ce19f94797ecd1ad1238;p=profitbricks%2Fjenkins-build-scripts.git

debian_build: change help instructions to be copy&pasteble
---

diff --git a/debian_build.py b/debian_build.py
index a2808dd..174236b 100755
--- a/debian_build.py
+++ b/debian_build.py
@@ -436,25 +436,26 @@ if __name__ == '__main__':
 
     # .. now handle the result
     if ret:
-        logger.error(
-            'git-buildpackage failed with exitcode {code}'.format(code=ret))
-        figlet('Build failed')
-        logger.info('''
+        logger.error('''git-buildpackage failed with exitcode {code}
+
   In case you need to analyze errors within chroot, do the following:
     * login to {hostname}
     * become {jenkins_user}
     * cd into {jenkins_workspace}
-    * export environment variables:
+    * execute
       export {gbp_env} FORCE_SHELL=TRUE
-    * start build:
+          
       {command}
- '''.format(
-        hostname=socket.gethostname(),
-        jenkins_user=ENV['USER'],
-        jenkins_workspace=ENV['WORKSPACE'],
-        gbp_env=' '.join(gbp.env),
-        command=gbp.command,
-    ))
+
+'''.format(
+            code=ret
+            hostname=socket.gethostname(),
+            jenkins_user=ENV['USER'],
+            jenkins_workspace=ENV['WORKSPACE'],
+            gbp_env=' '.join(['{k}="{v}"'.format(k=i,v=e[i]) for i in gbp.keys()]),
+            command=' '.join(gbp.command),
+        ))
+        figlet('Build failed')
         exit_error()
     else:
         logger.debug('git-buildpackage executed successfully')