Only modify non-masked keywords with "all"

svn path=/; revision=202

diff --git a/trunk/src/ekeyword/ChangeLog b/trunk/src/ekeyword/ChangeLog
index 881afee72a8bd4f97700f744dbb59d266d4d85cb..6be92a5be73e812348f2e5c3cd7f9d9761b7dada 100644 (file)
--- a/trunk/src/ekeyword/ChangeLog
+++ b/trunk/src/ekeyword/ChangeLog
@@ -1,3 +1,6 @@
+23 Mar 2005 Aron Griffis <agriffis@gentoo.org>
+       * Only modify non-masked keywords with "all"
+
 17 Mar 2005 Aron Griffis <agriffis@gentoo.org>
        * Sort keywords alphabetically
 

diff --git a/trunk/src/ekeyword/ekeyword b/trunk/src/ekeyword/ekeyword
index 46935df113225568a5d3fa8d028b3e96010fa417..738540b9eb56d1dd4a031c35cfce2bf4791f142d 100644 (file)
--- a/trunk/src/ekeyword/ekeyword
+++ b/trunk/src/ekeyword/ekeyword
@@ -68,8 +68,8 @@ for my $f (@ARGV) {
            # add or modify keywords
            else {
                if ($arch eq 'all') {
-                   # modify every keyword in the list
-                   $quoted =~ s/(^|\s)[-~]?(?=\w)/$1$leader/g;
+                   # modify all non-masked keywords in the list
+                   $quoted =~ s/(^|\s)~?(?=\w)/$1$leader/g;
                } else {
                    # modify or add keyword
                    unless ($quoted =~ s/[-~]?\Q$arch\E(\s|$)/$leader$arch$1/) {