From: Alan Ezust <alan.ezust@presinet.com>
To: netfilter@lists.netfilter.org
Subject: Re: patchomatic runme script bug - using backup files?
Date: Tue, 3 Oct 2006 10:46:34 -0700 [thread overview]
Message-ID: <200610031046.34705.alan.ezust@presinet.com> (raw)
In-Reply-To: <200610030855.16979.alan.ezust@presinet.com>
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.
>
prev parent reply other threads:[~2006-10-03 17:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-20 22:25 patchomatic runme script bug - using backup files? Alan Ezust
2006-10-03 15:55 ` Alan Ezust
2006-10-03 17:46 ` Alan Ezust [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200610031046.34705.alan.ezust@presinet.com \
--to=alan.ezust@presinet.com \
--cc=netfilter@lists.netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox