summaryrefslogtreecommitdiffstats
path: root/bin/dispatch-conf
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-09-24 22:15:16 +0000
committerZac Medico <zmedico@gentoo.org>2007-09-24 22:15:16 +0000
commitfbb24f41bbdf93a741196fa8a66ecc94ae6fb4d7 (patch)
tree3a20136db7a08f3442c24a84df25e150addd53e4 /bin/dispatch-conf
parente3da72ad6ef75d2a0bc4ea2c3b9c3a5b901e239a (diff)
downloadportage-fbb24f41bbdf93a741196fa8a66ecc94ae6fb4d7.tar.gz
portage-fbb24f41bbdf93a741196fa8a66ecc94ae6fb4d7.tar.bz2
portage-fbb24f41bbdf93a741196fa8a66ecc94ae6fb4d7.zip
Bug #74615 - Quote all file paths inside dispatch-conf shell commands.
svn path=/main/trunk/; revision=7803
Diffstat (limited to 'bin/dispatch-conf')
-rwxr-xr-xbin/dispatch-conf6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index e71512c7e..c1dd7a3d1 100755
--- a/bin/dispatch-conf
+++ b/bin/dispatch-conf
@@ -29,9 +29,9 @@ from portage import dispatch_conf
from portage.process import find_binary
FIND_EXTANT_CONFIGS = "find '%s' %s -iname '._cfg????_%s' ! -iname '.*~' ! -iname '.*.bak'"
-DIFF_CONTENTS = 'diff -Nu %s %s'
-DIFF_CVS_INTERP = 'diff -Nu %s %s | grep "^[+-][^+-]" | grep -v "# .Header:.*"'
-DIFF_WSCOMMENTS = 'diff -Nu %s %s | grep "^[+-][^+-]" | grep -v "^[-+]#" | grep -v "^[-+][:space:]*$"'
+DIFF_CONTENTS = "diff -Nu '%s' '%s'"
+DIFF_CVS_INTERP = "diff -Nu '%s' '%s' | grep '^[+-][^+-]' | grep -v '# .Header:.*'"
+DIFF_WSCOMMENTS = "diff -Nu '%s' '%s' | grep '^[+-][^+-]' | grep -v '^[-+]#' | grep -v '^[-+][:space:]*$'"
# We need a secure scratch dir and python does silly verbose errors on the use of tempnam
oldmask = os.umask(0077)