Re: patchomatic runme script bug - using backup files?

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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";

On Wednesday 20 September 2006 15:25, Alan Ezust wrote:
> 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.


[Index of Archives]     [Linux Netfilter Development]     [Linux Kernel Networking Development]     [Netem]     [Berkeley Packet Filter]     [Linux Kernel Development]     [Advanced Routing & Traffice Control]     [Bugtraq]

  Powered by Linux