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

[Christian Ruppert (idl0r)]

Author: idl0r
Date: 2010-07-02 15:08:45 +0000 (Fri, 02 Jul 2010)
New Revision: 785

Modified:
   trunk/gentoolkit-dev/ChangeLog
   trunk/gentoolkit-dev/src/ekeyword/ekeyword
Log:
ekeyword: Show "diff -U 0" to cover all changes.


Modified: trunk/gentoolkit-dev/ChangeLog
===================================================================
--- trunk/gentoolkit-dev/ChangeLog	2010-07-02 14:40:06 UTC (rev 784)
+++ trunk/gentoolkit-dev/ChangeLog	2010-07-02 15:08:45 UTC (rev 785)
@@ -1,5 +1,6 @@
 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.
 
 2010-05-17: Christian Ruppert <idl0r@g.o>
 	* echangelog: Update copyright in other files too (except binaries and

Modified: trunk/gentoolkit-dev/src/ekeyword/ekeyword
===================================================================
--- trunk/gentoolkit-dev/src/ekeyword/ekeyword	2010-07-02 14:40:06 UTC (rev 784)
+++ trunk/gentoolkit-dev/src/ekeyword/ekeyword	2010-07-02 15:08:45 UTC (rev 785)
@@ -40,8 +40,6 @@
 	open O, ">$f.new"   or die "Can't create $f.new: $!\n";
 	select O;
 
-	my $keys_before;
-	my $keys_after;
 	while (<I>) {
 		if (/^\s*KEYWORDS=/) {
 
@@ -52,7 +50,6 @@
 				$_ = join " ", $_, $next;
 			}
 			(my $quoted = $_) =~ s/^.*?["'](.*?)["'].*/$1/s;
-			$keys_before = $quoted;
 
 			# replace -* with -STAR for our convenience below
 			$quoted =~ s/-\*/-STAR/;
@@ -109,8 +106,6 @@
 				$sa cmp $sb;
 			} split " ", $quoted;
 
-			$keys_after = $quoted;
-
 			# re-insert quoted to KEYWORDS
 			s/(["']).*?["']/$1$quoted$1/;
 
@@ -124,19 +119,8 @@
 	close O;
 	select STDOUT;
 
-	if ($keys_before ne $keys_after) {
-		# This gives uniform output, but actually seems to make
-		# it harder to pick out differences, and doesn't work so
-		# well when adding/removing keywords
-		#$keys_before =~ s/(^| )/  /g;
-		#$keys_before =~ s/ ([-~])/$1/g;
-		#$keys_after =~ s/(^| )/  /g;
-		#$keys_after =~ s/ ([-~])/$1/g;
-		print "  -  $keys_before\n  +  $keys_after\n";
-		#system "diff -U 0 $f $f.new | sed -n -r 's:^(.)[[:space:]]*KEYWORDS=\"(.*)\":  \\1 \\2:p'";
-		#system "diff -U 0 $f $f.new | sed -n '/KEYWORDS=/s:^:  :p'";
-	}
-	rename "$f.new", "$f" or die "Can't rename: $!\n";
+	system("diff -U 0 ${f} ${f}.new");
+	rename("$f.new", "$f") or die "Can't rename: $!\n";
 	$files++;
 }