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 /cnf | |
| 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 'cnf')
| -rw-r--r-- | cnf/dispatch-conf.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cnf/dispatch-conf.conf b/cnf/dispatch-conf.conf index d4caa9557..d9ccc12a6 100644 --- a/cnf/dispatch-conf.conf +++ b/cnf/dispatch-conf.conf @@ -12,13 +12,13 @@ use-rcs=no # Diff for display # %s old file # %s new file -diff="diff -Nu %s %s | less --no-init --QUIT-AT-EOF" +diff="diff -Nu '%s' '%s' | less --no-init --QUIT-AT-EOF" # Diff for interactive merges. # %s output file # %s old file # %s new file -merge="sdiff --suppress-common-lines --output=%s %s %s" +merge="sdiff --suppress-common-lines --output='%s' '%s' '%s'" # Automerge files comprising only CVS interpolations (e.g. Header or Id) # (yes or no) |