A few minor changes to some messages and a couple variable improvements.

[rsync/rsync.git] / packaging / nightly-rsync

diff --git a/packaging/nightly-rsync b/packaging/nightly-rsync
index 6730662..e54424e 100755 (executable)
--- a/packaging/nightly-rsync
+++ b/packaging/nightly-rsync
@@ -51,8 +51,11 @@ if ($make_tar) {
                push(@files, $1);
                $dir = $1 . '/';
            }
-       } elsif (/^File: (.*?)\s+Status: / && $1 ne '.cvsignore') {
+       } elsif (/^File: (.*?)\s+Status: (.*)/ && $1 ne '.cvsignore') {
            push(@files, $dir . $1);
+           if ($2 ne 'Up-to-date') {
+               print "*** Not up-to-date: $dir$1\n";
+           }
        }
     }
     close CVS;
@@ -60,7 +63,7 @@ if ($make_tar) {
     print "Creating $unpacked/$name.tar.gz\n";
     chdir('..') or die $!;
     rename($unpacked, $name) or die $!;
-    open(TAR, '|-', "fakeroot tar --files-from=- --mode=g-w -czf $nightly/$name.tar.gz $name") or die $!;
+    open(TAR, '|-', "fakeroot tar --files-from=- --no-recursion --mode=g-w -czf $nightly/$name.tar.gz $name") or die $!;
     foreach (@files) {
        print TAR "$name/$_\n";
     }
@@ -95,7 +98,7 @@ system 'ls -ltr';
 
 if ($upload) {
     $ENV{RSYNC_PARTIAL_DIR} = ''; # The rsync on samba.org is OLD.
-    system "rsync -aviHP --delete -f 'H rsync/' . samba.org:/home/ftp/pub/rsync/nightly";
+    system "rsync -aviHP --delete-after . samba.org:/home/ftp/pub/rsync/nightly";
 }
 
 exit;