The branch, b3.0.x has been updated via 0c0219f Some fixes and improvements from the master branch. from a92edcb Avoid splitting a multi-byte character when trimming a name. Fixes bug 7816. Also makes the get_tmpname() code and comments more like the master.
;a=shortlog;h=b3.0.x - Log ----------------------------------------------------------------- commit 0c0219fe845d0d213782b7e67fdf65b5c5718f60 Author: Wayne Davison <way...@samba.org> Date: Thu Jan 13 23:03:59 2011 -0800 Some fixes and improvements from the master branch. ----------------------------------------------------------------------- Summary of changes: support/mnt-excl | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/support/mnt-excl b/support/mnt-excl index 5514d96..e741865 100755 --- a/support/mnt-excl +++ b/support/mnt-excl @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl # This script takes a command-line arg of a source directory # that will be passed to rsync, and generates a set of excludes # that will exclude all mount points from the list. This is @@ -18,19 +18,24 @@ # easily adapted to read /etc/mtab or similar. # # ADDENDUM: The addition of the --filter option (which has support for -# absolute-anchored excludes) has made this script less useful than it -# was. Beginning with 2.6.4, you can achieve the effect of this script -# through this command: +# absolute-anchored excludes) can make this screen unneeded in some +# scenarios. If you don't need delete protection on the receiving side +# (or if the destination path is identical to the source path), then you +# can exclude some absolute paths from the transfer based on the mount +# dirs. For instance: # -# awk '{print $2}' /proc/mounts | rsync -f 'merge,/- -' host:/dir /dest/ +# awk '{print $2}' /proc/mounts | grep -v '^/$' | \ +# rsync -avf 'merge,/- -' /dir host:/dest/ use strict; +use warnings; use Cwd 'abs_path'; my $file = '/proc/mounts'; my $dir = shift || '/'; -$dir = abs_path($dir); -$dir =~ s#([^/]*)$##; +my $trailing_slash = $dir =~ m{./$} ? '/' : ''; +$dir = abs_path($dir) . $trailing_slash; +$dir =~ s{([^/]*)$}{}; my $trailing = $1; $trailing = '' if $trailing eq '.' || !-d "$dir$trailing"; $trailing .= '/' if $trailing ne ''; @@ -38,7 +43,7 @@ $trailing .= '/' if $trailing ne ''; open(IN, $file) or die "Unable to open $file: $!\n"; while (<IN>) { $_ = (split)[1]; - next unless s#^\Q$dir$trailing\E##o && $_ ne ''; + next unless s{^\Q$dir$trailing\E}{}o && $_ ne ''; print "- /$trailing$_\n"; } close IN; -- The rsync repository. _______________________________________________ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs