diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-09-26 04:41:34 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-09-26 04:41:34 +0000 |
| commit | 8e2d9cd5ab9aabbfe1e65f635e7a10c473240d69 (patch) | |
| tree | 895887103d4b4baf425ea3903ca02f306f3387d1 /bin/dispatch-conf | |
| parent | b5f728a786d2fcb7f9960a96cfdf5fc26bcbb509 (diff) | |
| download | portage-8e2d9cd5ab9aabbfe1e65f635e7a10c473240d69.tar.gz portage-8e2d9cd5ab9aabbfe1e65f635e7a10c473240d69.tar.bz2 portage-8e2d9cd5ab9aabbfe1e65f635e7a10c473240d69.zip | |
Bug #74615 - Quote all file paths inside dispatch-conf shell
commands. (trunk r7803)
svn path=/main/branches/2.1.2/; revision=7831
Diffstat (limited to 'bin/dispatch-conf')
| -rwxr-xr-x | bin/dispatch-conf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/dispatch-conf b/bin/dispatch-conf index 6e7ab71f6..5d33343f7 100755 --- a/bin/dispatch-conf +++ b/bin/dispatch-conf @@ -29,9 +29,9 @@ import dispatch_conf from portage_exec 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) |