summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan Hill <dirtyepic@gentoo.org>2011-10-01 17:34:14 -0700
committerZac Medico <zmedico@gentoo.org>2011-10-01 17:34:14 -0700
commitfcba9794d9d377cafc60679fc800e3f5a5b506d7 (patch)
tree7ec084d84f0f76014ffe6375c6a32cfd5fca8829
parentb33e1b6d26f9c4df6a1b6773e5471e2caa1012b3 (diff)
downloadportage-fcba9794d9d377cafc60679fc800e3f5a5b506d7.tar.gz
portage-fcba9794d9d377cafc60679fc800e3f5a5b506d7.tar.bz2
portage-fcba9794d9d377cafc60679fc800e3f5a5b506d7.zip
dispatch-conf: fix replace-wscomments pattern
This will fix bug #375613.
-rwxr-xr-xbin/dispatch-conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index 9f245d571..3089329db 100755
--- a/bin/dispatch-conf
+++ b/bin/dispatch-conf
@@ -33,7 +33,7 @@ from portage.process import find_binary
FIND_EXTANT_CONFIGS = "find '%s' %s -name '._cfg????_%s' ! -name '.*~' ! -iname '.*.bak' -print"
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_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(0o077)