[gentoo-commits] gentoolkit r792 - in trunk/gentoolkit-dev: . src/ekeyword

[Christian Ruppert (idl0r)]

Author: idl0r
Date: 2010-07-03 08:56:48 +0000 (Sat, 03 Jul 2010)
New Revision: 792

Modified:
   trunk/gentoolkit-dev/ChangeLog
   trunk/gentoolkit-dev/src/ekeyword/ekeyword
Log:
ekeyword: Fix stabilization with "all", bug 304133#c11.


Modified: trunk/gentoolkit-dev/ChangeLog
===================================================================
--- trunk/gentoolkit-dev/ChangeLog	2010-07-02 16:28:04 UTC (rev 791)
+++ trunk/gentoolkit-dev/ChangeLog	2010-07-03 08:56:48 UTC (rev 792)
@@ -1,3 +1,6 @@
[phone]: Christian Ruppert <idl0r@g.o>
+	* ekeyword: Fix stabilization with "all", bug 304133#c11.
+
 2010-07-02: Christian Ruppert <idl0r@g.o>
 	* imlate: Don't ignore package names without category.
 	* ekeyword: Show "diff -U 0" to cover all changes.

Modified: trunk/gentoolkit-dev/src/ekeyword/ekeyword
===================================================================
--- trunk/gentoolkit-dev/src/ekeyword/ekeyword	2010-07-02 16:28:04 UTC (rev 791)
+++ trunk/gentoolkit-dev/src/ekeyword/ekeyword	2010-07-03 08:56:48 UTC (rev 792)
@@ -150,13 +150,22 @@
 
 						# Don't add stable keywords for != stable architectures
 						if(length($leader) eq 0) {
+							my @new;
 							foreach my $tmp (split(/\s/, $quoted)) {
-								my (undef, $_arch, undef) = ($tmp =~ m/$kw_re/o);
+								my ($_leader, $_arch, undef) = ($tmp =~ m/$kw_re/o);
+								$_leader = "" if !defined($_leader);
+								$_arch = "" if !defined($_arch);
 
-								if($ARCH{$_arch} and $ARCH{$_arch} eq 3) {
-									$quoted =~ s/\Q~${_arch}\E/${_arch}/;
+								if($_leader eq "~" && ($ARCH{$_arch} && $ARCH{$_arch} eq 3) ) {
+									push(@new, $_arch);
+									next;
 								}
+								else {
+									push(@new, "${_leader}${_arch}");
+									next;
+								}
 							}
+							$quoted = join(" ", @new);
 						}
 						else {
 							$quoted =~ s/(^|\s)~?(?=\w)/$1$leader/g;