[netfilter-cvslog] r6736 - trunk/patch-o-matic-ng

[kaber at netfilter.org]

Author: kaber at netfilter.org
Date: 2007-01-12 18:07:08 +0100 (Fri, 12 Jan 2007)
New Revision: 6736

Modified:
   trunk/patch-o-matic-ng/Netfilter_POM.pm
   trunk/patch-o-matic-ng/runme
Log:
[patch] POM-NG: runme message clarification and filename regex  fixes (Alan Ezust)


Modified: trunk/patch-o-matic-ng/Netfilter_POM.pm
===================================================================
--- trunk/patch-o-matic-ng/Netfilter_POM.pm	2007-01-11 12:30:41 UTC (rev 6735)
+++ trunk/patch-o-matic-ng/Netfilter_POM.pm	2007-01-12 17:07:08 UTC (rev 6736)
@@ -361,12 +361,13 @@
 	opendir(DIR, $dir)
 		or croak "can't open directory $dir: $!";
 	# Don't miss .foo-test files!
-	my @dents = sort grep {!/^(\.\.?|CVS|\.svn)$/} readdir(DIR);
+	my @dents = sort grep {!/^(\.\.?|CVS|\.svn|.*~)$/} readdir(DIR);
 	closedir(DIR);
 	foreach my $dent (@dents) {
 		my $fullpath = "$dir/$dent";
 		if (-f $fullpath) {
-			push(@{$patchlet->{$dent =~ /\.ladd/ ? 'ladds' : 'files'}->{$proj}->{$ver}}, "$pdir/$fullpath");
+			my $key = ($dent =~ /\.ladd/ ? 'ladds' : 'files');
+			push(@{$patchlet->{$key}->{$proj}->{$ver}}, "$pdir/$fullpath");
 		} elsif (-d _) {
 			$self->recurse($pdir, $fullpath, $patchlet, $proj, $ver);
 		}
@@ -486,7 +487,7 @@
 	# get list of source files that we'd need to copy
 	opendir(PDIR, $patchdir)
 		or croak "unable to open patchdir $patchdir: $!";
-	my @dents = sort readdir(PDIR);
+	my @dents = sort grep {!/^(\.\.?|CVS|\.svn|.*~)$/} readdir(PDIR);
 	closedir(PDIR);
 
 	foreach my $pf (@dents) {
@@ -494,7 +495,6 @@
 		my $ver;
 		my $oldpwd;
 
-		next if $pf =~ /^(\.|CVS$)/;
 
 		if ($pf =~ /\.patch/) {
 			# Patch file of a project:
@@ -820,22 +820,22 @@
 				print "patch output was:\n$patch_output\n";
 			}
 			if ($missing_files != 0) {
-				$self->{ERRMSG} .= "cannot apply ($missing_files missing files)\n";
+				$self->{ERRMSG} .= "cannot apply $patchfile: ($missing_files missing files)\n";
 				return 0;
 			# } elsif ($rejects*2 > $hunks) {
 			} elsif ($rejects != 0) {
-				$self->{ERRMSG} .= "cannot apply ($rejects rejects out of $hunks hunks)\n";
+				$self->{ERRMSG} .= "cannot apply $patchfile: ($rejects rejects out of $hunks hunks)\n";
 				return 0;
 			} else {
 				# could be applied!
-				#printf(" ALREADY APPLIED (%d rejects out of %d hunks)\n", $rejects, $hunks;
+				#printf(" ALREADY APPLIED $patchfile: (%d rejects out of %d hunks)\n", $rejects, $hunks;
 			}
 		} else {
 			if ($missing_files != 0) {
-				$self->{ERRMSG} .= "ERROR ($missing_files missing files)\n";
+				$self->{ERRMSG} .= "$patchfile: ERROR ($missing_files missing files)\n";
 				return 0;
 			} elsif ($rejects != 0) {
-				$self->{ERRMSG} .= "ERROR ($rejects rejects out of $hunks hunks)\n";
+				$self->{ERRMSG} .= "$patchfile: ERROR ($rejects rejects out of $hunks hunks)\n";
 				return 0;
 			}
 		}

Modified: trunk/patch-o-matic-ng/runme
===================================================================
--- trunk/patch-o-matic-ng/runme	2007-01-11 12:30:41 UTC (rev 6735)
+++ trunk/patch-o-matic-ng/runme	2007-01-12 17:07:08 UTC (rev 6736)
@@ -3,7 +3,7 @@
 # runme.pl, part of the patch-o-matig 'next generation' package.
 # (C) 2003-2004 by Harald Welte <laforge at netfilter.org>
 #     2004	by Jozsef Kadlecsik <kadlec at blackhole.kfki.ho>
-#
+#     2006      small fixes by Alan Ezust <alan.ezust at presinet.com>
 # This script is subject to the GNU GPLv2
 #
 # $Id$
@@ -346,15 +346,15 @@
 
 		print($clrscr);
 		print_header($session);
-		print("Already applied: ", join(" ", @{$session->{applied}}),"\n\n");
+		print("Already applied: ", join(" ", @{$session->{applied}}),"\n");
 
 		next PATCHLET unless $session->requirements_fulfilled($patchlet);
 		print("Testing ${plname}... ");
 		if (grep($_ eq $plname, @{$session->{applied}})) {
-			print("applied\n");
+			print("already applied.\n");
 			next PATCHLET;
 		} elsif ($session->apply_patchlet($patchlet, !$opt_reverse, 1, "/tmp/pom-$$", $opt_verbose)) {
-			print("applied\n");
+			print("Reverse Test passed - assuming already applied.\n");
 			push(@{$session->{applied}}, $plname);
 			next PATCHLET;
 		}