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

[Christian Ruppert (idl0r)]

Author: idl0r
Date: 2010-07-04 09:18:48 +0000 (Sun, 04 Jul 2010)
New Revision: 795

Modified:
   trunk/gentoolkit-dev/ChangeLog
   trunk/gentoolkit-dev/src/ekeyword/ekeyword
Log:
ekeyword: Don't touch an empty KEYWORDS variable in case it occurs more 
than once, like in live ebuilds. Bug 321475.


Modified: trunk/gentoolkit-dev/ChangeLog
===================================================================
--- trunk/gentoolkit-dev/ChangeLog	2010-07-03 09:53:46 UTC (rev 794)
+++ trunk/gentoolkit-dev/ChangeLog	2010-07-04 09:18:48 UTC (rev 795)
@@ -1,4 +1,8 @@
 2010-07-03: Christian Ruppert <idl0r@g.o>
+	* ekeyword: Don't touch an empty KEYWORDS variable in case it occurs more
+	than once, like in live ebuilds. Bug 321475.
+
[phone]: Christian Ruppert <idl0r@g.o>
 	* ekeyword: Fix stabilization with "all", bug 304133#c11.
 
 2010-07-02: Christian Ruppert <idl0r@g.o>

Modified: trunk/gentoolkit-dev/src/ekeyword/ekeyword
===================================================================
--- trunk/gentoolkit-dev/src/ekeyword/ekeyword	2010-07-03 09:53:46 UTC (rev 794)
+++ trunk/gentoolkit-dev/src/ekeyword/ekeyword	2010-07-04 09:18:48 UTC (rev 795)
@@ -112,6 +112,12 @@
 	open O, ">$f.new"   or die "Can't create $f.new: $!\n";
 	select O;
 
+	my $count = 0;
+	while(<I>) {
+		$count++ if m/^\s*KEYWORDS=/;
+	}
+	seek(I, 0, 0);
+
 	while (<I>) {
 		if (/^\s*KEYWORDS=/) {
 
@@ -123,6 +129,13 @@
 			}
 			(my $quoted = $_) =~ s/^.*?["'](.*?)["'].*/$1/s;
 
+			if($count > 1 && length($quoted) eq 0) {
+				# Skip empty KEYWORDS variables in case they occur more than
+				# once, bug 321475.
+				print $_;
+				next;
+			}
+
 			# replace -* with -STAR for our convenience below
 			$quoted =~ s/-\*/-STAR/;