From: Wayne Davison <wayned@samba.org>
Date: Wed, 26 May 2010 18:24:00 +0000 (-0700)
Subject: Update rrsync with the latest options.
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/47573508f43ef21e54626a3a50d6b0cd9de78064

Update rrsync with the latest options.
---

diff --git a/packaging/cull_options b/packaging/cull_options
index 3ef470df..add2b988 100755
--- a/packaging/cull_options
+++ b/packaging/cull_options
@@ -7,7 +7,7 @@ use strict;
 our %short_no_arg;
 our %short_with_num;
 our %long_opt = (
-    'no-i-r' => 0,
+    'daemon' => -1,
     'fake-super' => 0,
     'log-file' => 3,
 );
@@ -24,7 +24,7 @@ while (<IN>) {
 	undef $last_long_opt;
     } elsif (/\Qargs[ac++]\E = "--([^"=]+)"/) {
 	$last_long_opt = $1;
-	$long_opt{$1} = 0;
+	$long_opt{$1} = 0 unless exists $long_opt{$1};
     } elsif (defined($last_long_opt)
 	&& /\Qargs[ac++]\E = ([^["\s]+);/ && $1 ne 'dest_option') {
 	$long_opt{$last_long_opt} = 2;
diff --git a/support/rrsync b/support/rrsync
index 0369bc65..e3c5d41a 100644
--- a/support/rrsync
+++ b/support/rrsync
@@ -74,15 +74,18 @@ our %long_opt = (
   'delete-delay' => 0,
   'delete-during' => 0,
   'delete-excluded' => 0,
+  'delete-missing-args' => 0,
   'existing' => 0,
   'fake-super' => 0,
   'files-from' => 3,
   'force' => 0,
   'from0' => 0,
   'fuzzy' => 0,
+  'groupmap' => 1,
   'iconv' => 1,
   'ignore-errors' => 0,
   'ignore-existing' => 0,
+  'ignore-missing-args' => 0,
   'inplace' => 0,
   'link-dest' => 2,
   'list-only' => 0,
@@ -92,7 +95,6 @@ our %long_opt = (
   'max-size' => 1,
   'min-size' => 1,
   'modify-window' => 1,
-  'no-i-r' => 0,
   'no-implied-dirs' => 0,
   'no-r' => 0,
   'no-relative' => 0,
@@ -109,11 +111,13 @@ our %long_opt = (
   'size-only' => 0,
   'skip-compress' => 1,
   'specials' => 0,
+  'stats' => 0,
   'suffix' => 1,
   'super' => 0,
   'temp-dir' => 2,
   'timeout' => 1,
   'use-qsort' => 0,
+  'usermap' => 1,
 );
 
 ### END of options data produced by the cull_options script. ###