Handle --preserve=all

fr.po

@@ -197,8 +197,11 @@ msgid "force overwriting of existing files"
 msgstr "force le remplacement des fichiers déjà existants"
 
 #: gcp:545
-msgid "preserve  the  specified  attributes"
+#, python-format
-msgstr "garde les attributs spécifiés"
+msgid "preserve  the  specified  attributes; accepted values:\
+'all', or one or more amongst %s"
+msgstr "garde les attributs spécifiés; valeurs acceptées : 'all' ou\
+un ou plusieurs éléments parmi %s"
 
 #: gcp:551
 msgid "don't fix filesystem name incompatibily"
@@ -245,12 +248,9 @@ msgid "Progress bar is not available, deactivating"
 msgstr "La barre de progression n'est pas disponible, désactivation"
 
 #: gcp:595
-msgid ""
+#, python-format
-"Invalid --preserve value\n"
+msgid "Invalid --preserve value '%s'"
-"valid values are:"
+msgstr "Valeur de --preserve invalide « %s »"
-msgstr ""
-"La valeur de «--preserve» est invalide\n"
-"Les valeurs valides sont:"
 
 #: gcp:616
 #, python-format

gcp

@@ -566,7 +566,8 @@ class GCP():
         )
         parser.add_argument("--preserve",
             action="store", default='',
-            help=_("preserve  the  specified  attributes")
+            help=_("preserve  the  specified  attributes; accepted values:\
+                   'all', or one or more amongst %s") % str(const_PRESERVE)
         )
         parser.add_argument("-L", "--dereference",
             action="store_true", default=False,
@@ -646,22 +647,26 @@ class GCP():
         if options.no_fs_fix:
             options.fs_fix = 'no'
 
+        preserve = set()
+
         if options.p:
-            if not options.preserve:
+            preserve.update(const_PRESERVE_p.split(','))
-                options.preserve = const_PRESERVE_p
-            else:
-                options.preserve += ',' + const_PRESERVE_p
 
         if options.preserve:
-            preserve = set(options.preserve.split(','))
+            preserve.update(options.preserve.split(','))
-            if not preserve.issubset(const_PRESERVE):
+            preserve_all = False
-                error (_("Invalid --preserve value\nvalid values are:"))
+            for value in preserve:
-                for value in const_PRESERVE:
+                if value == 'all':
-                    error('- %s' % value)
+                    preserve_all = True
-                exit(1)
+                    continue
-            options.preserve = preserve
+                if value not in const_PRESERVE:
-        else:
+                    error (_("Invalid --preserve value '%s'") % value)
-            options.preserve = set()
+                    exit(1)
+            if preserve_all:
+                preserve.remove('all')
+                preserve.update(const_PRESERVE)
+
+        options.preserve = preserve
 
         self.__sourcesSaving(options, args)
 

gcp.po

@@ -120,7 +120,9 @@ msgid "force overwriting of existing files"
 msgstr ""
 
 #: gcp:321
-msgid "preserve  the  specified  attributes"
+#, python-format
+msgid "preserve  the  specified  attributes; accepted values:\
+'all', or one or more amongst %s"
 msgstr ""
 
 #: gcp:324
@@ -140,9 +142,8 @@ msgid "Progress bar is not available, deactivating"
 msgstr ""
 
 #: gcp:345
-msgid ""
+#, python-format
-"Invalid --preserve value\n"
+msgid "Invalid --preserve value '%s'"
-"valid values are:"
 msgstr ""
 
 #: gcp:354