summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2009-04-15 23:15:53 +0000
committermh <mh@immerda.ch>2009-04-15 23:15:53 +0000
commit6cca98c828c7e7d91045a2a6bac7d831c7013723 (patch)
treef2c37ed32a8d4976f84a75a8f19e09578ea359d6
parent393cbe09d39cd9d93b002a0aff44460dd0936aa8 (diff)
downloadpuppet-rsync-6cca98c828c7e7d91045a2a6bac7d831c7013723.tar.gz
puppet-rsync-6cca98c828c7e7d91045a2a6bac7d831c7013723.tar.bz2
updated rrsync to work with rsync newer versions
-rwxr-xr-xfiles/rrsync/rrsync4
1 files changed, 2 insertions, 2 deletions
diff --git a/files/rrsync/rrsync b/files/rrsync/rrsync
index e950b19..b084200 100755
--- a/files/rrsync/rrsync
+++ b/files/rrsync/rrsync
@@ -50,7 +50,7 @@ die "$0 -ro: sending to read-only server not allowed\n" if $ro && !$am_sender;
# To disable a short-named option, add its letter to this string:
our $short_disabled = '';
-our $short_no_arg = 'CDEHIKLORSWbcdgklmnoprtuvxz'; # DO NOT REMOVE ANY
+our $short_no_arg = 'ACDEHIKLORSWXbcdgiklmnoprstuvxz'; # DO NOT REMOVE ANY
our $short_with_num = 'B'; # DO NOT REMOVE ANY
# To disable a long-named option, change its value to a -1. The values mean:
@@ -135,7 +135,7 @@ while ($command =~ /((?:[^\s\\]+|\\.[^\s\\]*)+)/g) {
if ($_ eq '.') {
$in_options = 0;
} else {
- next if /^-$short_no_arg+$/o || /^-$short_with_num\d+$/o;
+ next if /^-($short_no_arg|e\d*\.\d*)+$/o || /^-$short_with_num\d+$/o;
my($opt,$arg) = /^--([^=]+)(?:=(.*))?$/;
my $disabled;