The branch, master has been updated
via 289ccbd Allow samba.org hostname to be overridden.
from 85d3877 Improve mergedir filter handling internals. Fixes bug 10995.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 289ccbd02f2ac95179f1da40afb9c7d4f8c6cc8b
Author: Wayne Davison <way...@samba.org>
Date: Sat Jul 18 14:31:08 2015 -0700
Allow samba.org hostname to be overridden.
-----------------------------------------------------------------------
Summary of changes:
Makefile.in | 4 ++--
packaging/nightly-rsync | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/Makefile.in b/Makefile.in
index 2fddfef..b041b2c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -139,7 +139,7 @@ t_unsafe$(EXEEXT): $(T_UNSAFE_OBJ)
gen: conf proto.h man
gensend: gen
- rsync -aivzc $(GENFILES) samba.org:/home/ftp/pub/rsync/generated-files/
+ rsync -aivzc $(GENFILES)
$${SAMBA_HOST-samba.org}:/home/ftp/pub/rsync/generated-files/
conf:
cd $(srcdir) && $(MAKE) -f prepare-source.mak conf
@@ -313,4 +313,4 @@ doxygen:
# for maintainers only
doxygen-upload:
rsync -avzv $(srcdir)/dox/html/ --delete \
- samba.org:/home/httpd/html/rsync/doxygen/head/
+ $${SAMBA_HOST-samba.org}:/home/httpd/html/rsync/doxygen/head/
diff --git a/packaging/nightly-rsync b/packaging/nightly-rsync
index 8ec10e5..23451ca 100755
--- a/packaging/nightly-rsync
+++ b/packaging/nightly-rsync
@@ -16,6 +16,7 @@ use Date::Format;
# Where the local copy of /home/ftp/pub/rsync/dev/nightly should be updated.
our $dest = $ENV{HOME} . '/samba-rsync-ftp/dev/nightly';
+our $samba_host = $ENV{SAMBA_HOST} || 'samba.org';
our $nightly_symlink = "$dest/rsync-HEAD.tar.gz";
our($make_tar, $upload, $help_opt);
@@ -156,7 +157,7 @@ if ($upload) {
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/dev/nightly";
+ system "rsync$opt -aviHP --delete-after .
$samba_host\:/home/ftp/pub/rsync/dev/nightly";
}
exit;
--
The rsync repository.
_______________________________________________
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
