Found another place which also needed to be patched. Here is the updated diff:
diff -u ../patch-o-matic-ng-trunk/Netfilter_POM.pm Netfilter_POM.pm
--- ../patch-o-matic-ng-trunk/Netfilter_POM.pm 2006-10-03
08:21:19.000000000 -0700
+++ Netfilter_POM.pm 2006-10-03 10:23:52.000000000 -0700
@@ -361,7 +361,7 @@
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";
@@ -486,7 +486,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 +494,6 @@
my $ver;
my $oldpwd;
- next if $pf =~ /^(\.|CVS$)/;
if ($pf =~ /\.patch/) {
# Patch file of a project:
On Tuesday 03 October 2006 08:55, Alan Ezust wrote:
> Hi - I don't have commit access yet, so I'm hoping someone will apply this
> patch for me.
>
> This patch will prevent patchomatic from sucking up old backup files when
> it's applying patches.
>
