summaryrefslogtreecommitdiff
path: root/trunk/src/ekeyword
diff options
context:
space:
mode:
authoragriffis <agriffis@gentoo.org>2005-03-23 18:20:00 +0000
committeragriffis <agriffis@gentoo.org>2005-03-23 18:20:00 +0000
commitb70beb69251d0abf7802fe24ecda4ede67d163dc (patch)
tree183b53c7f0a5c58929f179056c1e782aeba1a3a9 /trunk/src/ekeyword
parentf4bddf72d233a0c197129caee9a161167ac09d2c (diff)
downloadgentoolkit-b70beb69251d0abf7802fe24ecda4ede67d163dc.tar.gz
Only modify non-masked keywords with "all"
svn path=/; revision=202
Diffstat (limited to 'trunk/src/ekeyword')
-rw-r--r--trunk/src/ekeyword/ChangeLog3
-rw-r--r--trunk/src/ekeyword/ekeyword4
2 files changed, 5 insertions, 2 deletions
diff --git a/trunk/src/ekeyword/ChangeLog b/trunk/src/ekeyword/ChangeLog
index 881afee..6be92a5 100644
--- 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 46935df..738540b 100644
--- 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/) {