From: Ralf Jung <post@ralfj.de>
Date: Fri, 27 Jul 2012 12:41:00 +0000 (+0200)
Subject: Properly escape everything
X-Git-Url: https://git.ralfj.de/auto-debuild.git/commitdiff_plain/56b1f3cca6e5bb3fc8ddb03599029791cd747aa9?ds=sidebyside

Properly escape everything
---

diff --git a/auto_debuild.py b/auto_debuild.py
index efc36eb..5260689 100755
--- a/auto_debuild.py
+++ b/auto_debuild.py
@@ -58,11 +58,11 @@ def automakeRules(config):
 	r.rules['auto_configure'] = [
 		'BUILD_TYPE=$$(dpkg-architecture -qDEB_BUILD_GNU_TYPE) && ' + # doing the expansion beforehand ensures that we cancel if it fails
 		'MULTIARCH=$$(dpkg-architecture -qDEB_BUILD_MULTIARCH) && '+
-			'./configure --build=$$BUILD_TYPE ' +
-			'--prefix=/usr --includedir=/usr/include --mandir=/usr/share/man --infodir=/usr/share/info ' +
-			'--libdir=/usr/lib/$$MULTIARCH --libexecdir=/usr/lib/$$MULTIARCH '+
-			'--sysconfdir=/etc --localstatedir=/var ' +
-			' '.join(config.get('automakeParameters', []))
+			safeCall(['./configure', '--build=$$BUILD_TYPE',
+			'--prefix=/usr', '--includedir=/usr/include', '--mandir=/usr/share/man', '--infodir=/usr/share/info',
+			'--libdir=/usr/lib/$$MULTIARCH', '--libexecdir=/usr/lib/$$MULTIARCH',
+			'--sysconfdir=/etc', '--localstatedir=/var '] +
+			config.get('automakeParameters', []))
 	]
 	r.rules['auto_clean'] = ['rm -f config.status'] # do not re-use old configuration
 	return r
@@ -165,8 +165,8 @@ def createDebianFiles(config):
 		r.rules['auto_install'] = [safeCall(['dh_auto_install', '--destdir=debian/'+binaryName])] # install everything into the binary package
 		# for debug packages
 		if dbgPackage:
-			r.rules['strip'] = ['dh_strip --dbg-package='+binaryName+"-dbg"] # put debug files in appropriate package
-			r.rules['installdocs'] = ['dh_installdocs --link-doc='+binaryName] # make the doc folder of the dbg package a symlink
+			r.rules['strip'] = [safeCall(['dh_strip', '--dbg-package='+binaryName+"-dbg"])] # put debug files in appropriate package
+			r.rules['installdocs'] = [safeCall(['dh_installdocs', '--link-doc='+binaryName])] # make the doc folder of the dbg package a symlink
 		# dump it to a file
 		r.write(f)
 	mode = os.stat('debian/rules').st_mode