Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Conditional symlink-checking code in unchanged_attrs() should be
[rsync/rsync.git]
/
packaging
/
nightly-rsync
diff --git
a/packaging/nightly-rsync
b/packaging/nightly-rsync
index
f8da0b3
..
7b21f3d
100755
(executable)
--- a/
packaging/nightly-rsync
+++ b/
packaging/nightly-rsync
@@
-18,6
+18,7
@@
use Date::Format;
our $unpacked = $ENV{HOME} . '/release/nightly';
# Where the local copy of /home/ftp/pub/rsync/nightly should be updated.
our $nightly = $ENV{HOME} . '/samba-rsync-ftp/nightly';
our $unpacked = $ENV{HOME} . '/release/nightly';
# Where the local copy of /home/ftp/pub/rsync/nightly should be updated.
our $nightly = $ENV{HOME} . '/samba-rsync-ftp/nightly';
+our $nightly_symlink = "$nightly/rsync-HEAD.tar.gz";
our($cvs_update, $make_tar, $upload, $help_opt);
&Getopt::Long::Configure('bundling');
our($cvs_update, $make_tar, $upload, $help_opt);
&Getopt::Long::Configure('bundling');
@@
-51,8
+52,11
@@
if ($make_tar) {
push(@files, $1);
$dir = $1 . '/';
}
push(@files, $1);
$dir = $1 . '/';
}
- } elsif (/^File: (.*?)\s+Status: / && $1 ne '.cvsignore') {
+ } elsif (/^File: (.*?)\s+Status:
(.*)
/ && $1 ne '.cvsignore') {
push(@files, $dir . $1);
push(@files, $dir . $1);
+ if ($2 ne 'Up-to-date') {
+ print "*** Not up-to-date: $dir$1\n";
+ }
}
}
close CVS;
}
}
close CVS;
@@
-66,6
+70,8
@@
if ($make_tar) {
}
close TAR;
rename($name, $unpacked) or die $!;
}
close TAR;
rename($name, $unpacked) or die $!;
+ unlink($nightly_symlink);
+ symlink("$name.tar.gz", $nightly_symlink);
}
chdir($nightly) or die $!;
}
chdir($nightly) or die $!;
@@
-90,12
+96,23
@@
foreach my $fn (qw( rsync.yo rsyncd.conf.yo )) {
unlink($fn);
}
unlink($fn);
}
-system "find . -name 'rsync-HEAD-*' -daystart -mtime +14 | xargs rm -f";
+my $cnt = 0;
+open(PIPE, '-|', 'ls -1t rsync-HEAD-*') or die $!;
+while (<PIPE>) {
+ chomp;
+ next if $cnt++ < 10;
+ unlink($_);
+}
+close PIPE;
+
system 'ls -ltr';
if ($upload) {
system 'ls -ltr';
if ($upload) {
- $ENV{RSYNC_PARTIAL_DIR} = ''; # The rsync on samba.org is OLD.
- system "rsync -aviHP --delete . samba.org:/home/ftp/pub/rsync/nightly";
+ my $opt = '';
+ if (defined $ENV{RSYNC_PARTIAL_DIR}) {
+ $opt = " -f 'R $ENV{RSYNC_PARTIAL_DIR}'";
+ }
+ system "rsync$opt -aviHP --delete-after . samba.org:/home/ftp/pub/rsync/nightly";
}
exit;
}
exit;