| 1 |
commit: fcba9794d9d377cafc60679fc800e3f5a5b506d7 |
| 2 |
Author: Ryan Hill <dirtyepic <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 2 00:34:14 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 2 00:34:14 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=fcba9794 |
| 7 |
|
| 8 |
dispatch-conf: fix replace-wscomments pattern |
| 9 |
|
| 10 |
This will fix bug #375613. |
| 11 |
|
| 12 |
--- |
| 13 |
bin/dispatch-conf | 2 +- |
| 14 |
1 files changed, 1 insertions(+), 1 deletions(-) |
| 15 |
|
| 16 |
diff --git a/bin/dispatch-conf b/bin/dispatch-conf |
| 17 |
index 9f245d5..3089329 100755 |
| 18 |
--- a/bin/dispatch-conf |
| 19 |
+++ b/bin/dispatch-conf |
| 20 |
@@ -33,7 +33,7 @@ from portage.process import find_binary |
| 21 |
FIND_EXTANT_CONFIGS = "find '%s' %s -name '._cfg????_%s' ! -name '.*~' ! -iname '.*.bak' -print" |
| 22 |
DIFF_CONTENTS = "diff -Nu '%s' '%s'" |
| 23 |
DIFF_CVS_INTERP = "diff -Nu '%s' '%s' | grep '^[+-][^+-]' | grep -v '# .Header:.*'" |
| 24 |
-DIFF_WSCOMMENTS = "diff -Nu '%s' '%s' | grep '^[+-][^+-]' | grep -v '^[-+]#' | grep -v '^[-+][:space:]*$'" |
| 25 |
+DIFF_WSCOMMENTS = "diff -Nu '%s' '%s' | grep '^[+-][^+-]' | grep -v '^[-+]#' | grep -v '^[-+][[:space:]]*$'" |
| 26 |
|
| 27 |
# We need a secure scratch dir and python does silly verbose errors on the use of tempnam |
| 28 |
oldmask = os.umask(0o077) |
Archives