From: Mathias Klette <mathias.klette@profitbricks.com>
Date: Wed, 31 Aug 2011 19:03:27 +0000 (+0200)
Subject: Merge branch 'daily' of ssh://git/srv/git/jenkins_build_script into daily
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=141cbe0bf71db3e9947cc2751cf50a558faac7a6;p=profitbricks%2Fjenkins-build-scripts.git

Merge branch 'daily' of ssh://git/srv/git/jenkins_build_script into daily

Conflicts:
	build.py
---

141cbe0bf71db3e9947cc2751cf50a558faac7a6
diff --cc build.py
index caa1ff9,a880847..2c5ecbf
--- a/build.py
+++ b/build.py
@@@ -363,11 -363,11 +363,11 @@@ if __name__ == '__main__'
          logger.info(stdout_msg)
  
  	# i hate this: a version needs to include a . now...
 -	#cmd = ['grep-dctrl', '-n', '-s', 'Version', '.']
 -	cmd = [ "awk '/^Version: / {print $2}'"]
 +	cmd = ['grep-dctrl', '-n', '-s', 'Version', '']
- 	#cmd = [ 'awk', '/^Version: / {print $2}']
++	#cmd = [ "awk '/^Version: / {print $2}'"]
  	grep_dctrl =  subprocess.Popen(
                  cmd,
-                 shell=False,
+                 shell=True,
                  close_fds=True,
  		stdin=parse_changelog.stdout,
                  stdout=subprocess.PIPE,