From: Ryan Hill <dirtyepic@gentoo.org>
Date: Sun, 2 Oct 2011 00:34:14 +0000 (-0700)
Subject: dispatch-conf: fix replace-wscomments pattern
X-Git-Tag: v2.2.0_alpha61~32
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fcba9794d9d377cafc60679fc800e3f5a5b506d7;p=portage.git

dispatch-conf: fix replace-wscomments pattern

This will fix bug #375613.
---

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)