diff options
| author |   Christian Ruppert <idl0r@gentoo.org> | 2012-04-23 05:15:07 +0200 |
|---|---|---|
| committer | Christian Ruppert <idl0r@gentoo.org> | 2012-04-23 05:15:07 +0200 |
| commit | 89fe45b61ff192c463f9de8ee7a01a48ec42b680 (patch) | |
| tree | dba93c79f559128aa12ec96b130a75c951dd91e5 | |
| parent | Do a basic pre sort to get a rid of duplicates (diff) | |
| download | gentoolkit-89fe45b61ff192c463f9de8ee7a01a48ec42b680.tar.gz gentoolkit-89fe45b61ff192c463f9de8ee7a01a48ec42b680.tar.bz2 gentoolkit-89fe45b61ff192c463f9de8ee7a01a48ec42b680.zip | |
Improve removal handling
Fix "ekeyword ^sparc *.ebuild" removing the "sparc" from e.g.
~sparc-solaris
Reported-by: Raúl Porcel <armin76@gentoo.org>
X-Gentoo-Bug: 413133
X-Gentoo-Bug-URL: https://bugs.gentoo.org/413133
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rwxr-xr-x | src/ekeyword/ekeyword | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -2,6 +2,8 @@ * ekeyword: Some cleanup Do a basic pre sort to get a rid of duplicates, bug 399575. NOTE: e.g. ~amd64 and -amd64 wouldn't be detected as duplicate! + Fix "ekeyword ^sparc *.ebuild" removing the "sparc" from e.g. + ~sparc-solaris, bug 413133. 2012-04-09: Christian Ruppert <idl0r@gentoo.org> * echangelog: Improve the VCS check by adding a fallback/default PATH in diff --git a/src/ekeyword/ekeyword b/src/ekeyword/ekeyword index 2b1ac94..33ebb4f 100755 --- a/src/ekeyword/ekeyword +++ b/src/ekeyword/ekeyword @@ -161,7 +161,7 @@ for my $f (@ARGV) { if ($arch eq 'all') { $quoted = ''; } else { - $quoted =~ s/[-~]?\Q$arch\E\b//; + $quoted =~ s/[-~]?\Q$arch\E(\s|$)/$1/; } # add or modify keywords |