Skip to contentSkip to conversation

patchomatic runme script bug - using backup files?

DISCUSSION Alan Ezust 1 participant 3 messages Sep 20, 2006 – Oct 3, 2006

lore
Share & tools
lore

Alan Ezust

author
#0 lore raw

I just ran into this bug in runme script from patchomatic - I was writing a patch file called linux-2.6.16.29.patch but there was a BACKUP file called linux-2.6.16.29.patch~ and another one called linux-2.6.patch~ and it seems to be finding the BACKUP files and using them in favor of the actual patch files I am developing. Since the output doesn't tell me which file it is reading, I couldn't tell what was wrong, and wasted quite a lot of time looking at a file that wasn't even being read by runme.

author
#1 lore raw

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.

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 08:46:41.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";
Quoted 7 lines · Alan Ezust

I just ran into this bug in runme script from patchomatic - I was writing a patch file called linux-2.6.16.29.patch but there was a BACKUP file called linux-2.6.16.29.patch~ and another one called linux-2.6.patch~ and it seems to be finding the BACKUP files and using them in favor of the actual patch files I am developing. Since the output doesn't tell me which file it is reading, I couldn't tell what was wrong, and wasted quite a lot of time looking at a file that wasn't even being read by runme.

author
#2 lore raw

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:

Quoted 6 lines · Alan Ezust

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.