[patch] genlop_bug211688.patch

genlop_bug211688.patch (text/plain), 2.67 KB, created by [e-mail] on 2008-02-29 03:39:59 UTC

Index: genlop
===================================================================
--- genlop	(revision 207)
+++ genlop	(working copy)
@@ -298,8 +298,7 @@
 					if (!-r $ARGV[0])
 					{
 						print color 'bold red';
-						print "!!! Error: logfile " . $ARGV[0]
-							. " not readable ", "or not found.";
+						print "!!! Error: logfile $ARGV[0] not readable or not found.";
 						print color 'reset';
 						print "\n";
 						exit -1;
@@ -450,7 +449,7 @@
 	my $regexp;
 	my @list;
 
-	if ($list_found)
+	if ($list_found or $unmerge_found)
 	{
 		if ($arg =~ m{^=})
 		{
@@ -991,6 +990,7 @@
 
 if (    !$targets[0]
 	and !$list_found
+	and !$unmerge_found
 	and !$current_found
 	and !$pretend_found
 	and !$rsync_found)
@@ -1001,6 +1001,7 @@
 # FIXME questi a cosa servono ?
 if ($rsync_found)   { @targets = (); push @targets, "-r"; }
 if ($list_found)    { @targets = (); push @targets, "-l"; }
+if ($unmerge_found) { @targets = (); push @targets, "-u"; }
 if ($pretend_found) { @targets = (); push @targets, "-p"; }
 if ($current_found) { @targets = (); push @targets, "-c"; }
 
@@ -1022,7 +1023,7 @@
 
 	# this is for packages like gtk+
 	$ebuild_arg =~ s/(\+)/\\$1/g;
-
+	
 	foreach my $logfile (@logfiles)
 	{
 		my $handle;
@@ -1076,25 +1077,39 @@
 				}
 				if (!$e_count)
 				{
+					# TODO: this bunch of repeated code can be refactored.
 					my $p_ebuild = " \* $2\n\n";
 					$p_ebuild =~ s/\\//g;
-					if (!$search_found)
+					if ($search_found)
 					{
+						print colored(" \* matches found:\n\n", $COLORS{'blue'});
+					}
+					elsif ($list_found && $unmerge_found)
+					{
+						print colored(" \* packages merged and unmerged:\n\n", 
+							$COLORS{'blue'});
+					}
+					elsif ($list_found)
+					{
+						print colored(" \* packages merged:\n\n", $COLORS{'blue'});
+					}
+					elsif ($unmerge_found)
+					{
+						print colored(" \* packages unmerged:\n\n", $COLORS{'blue'});
+					}
+					else
+					{
 						if ($ebuild_arg =~ m/\/$/)
 						{
-							print colored("\* $ebuild_arg\n\n", $COLORS{'blue'});
+							print colored(" \* $ebuild_arg\n\n", $COLORS{'blue'});
 						}
 						else
 						{
 							print colored("$p_ebuild", $COLORS{'blue'});
 						}
 					}
-					else
-					{
-						print colored(" \* matches found:\n\n", $COLORS{'blue'});
-					}
 				}
-				if ($ebuild_found or !$info_found or $time_found)
+				if ($list_found or $ebuild_found or $time_found)
 				{
 					my $eb = $2;
 					my $extra = $3 || "";
@@ -1133,7 +1148,7 @@
 			}
 		}
 	}
-	if (!$e_count and !$list_found and !$rsync_found)
+	unless ($e_count or $unmerge_found or $list_found or $rsync_found)
 	{
 		if ($e_count == 0)
 		{
@@ -1174,4 +1189,3 @@
 	print "$lhtomsg\n";
 	print color 'reset';
 }
-