=== modified file 'duplicity/commandline.py'
--- duplicity/commandline.py	2014-01-21 16:34:00 +0000
+++ duplicity/commandline.py	2014-01-02 23:36:25 +0000
@@ -329,6 +329,15 @@
 
     # used to provide a prefix on top of the defaul tar file name
     parser.add_option("--file-prefix", type = "string", dest = "file_prefix", action = "store")
+    
+    # used to provide a prefix for manifest files only
+    parser.add_option("--manifest-file-prefix", type = "string", dest = "manifest_file_prefix", action = "store")
+
+    # used to provide a prefix for archive files only
+    parser.add_option("--archive-file-prefix", type = "string", dest = "archive_file_prefix", action = "store")
+
+    # used to provide a prefix for sig files only
+    parser.add_option("--sig-file-prefix", type = "string", dest = "sig_file_prefix", action = "store")
 
     # used in testing only - skips upload for a given volume
     parser.add_option("--skip-volume", type = "int",

=== modified file 'duplicity/file_naming.py'
--- duplicity/file_naming.py	2012-02-07 22:22:16 +0000
+++ duplicity/file_naming.py	2014-01-02 23:52:58 +0000
@@ -55,47 +55,47 @@
     if full_vol_re:
         return
 
-    full_vol_re = re.compile("^" + globals.file_prefix + "duplicity-full"
+    full_vol_re = re.compile("^" + globals.file_prefix + globals.archive_file_prefix + "duplicity-full"
                          "\\.(?P<time>.*?)"
                          "\\.vol(?P<num>[0-9]+)"
                          "\\.difftar"
                          "(?P<partial>(\\.part))?"
                          "($|\\.)")
 
-    full_vol_re_short = re.compile("^" + globals.file_prefix + "df"
+    full_vol_re_short = re.compile("^" + globals.file_prefix + globals.archive_file_prefix + "df"
                                "\\.(?P<time>[0-9a-z]+?)"
                                "\\.(?P<num>[0-9a-z]+)"
                                "\\.dt"
                                "(?P<partial>(\\.p))?"
                                "($|\\.)")
 
-    full_manifest_re = re.compile("^" + globals.file_prefix + "duplicity-full"
+    full_manifest_re = re.compile("^" + globals.file_prefix + globals.manifest_file_prefix + "duplicity-full"
                               "\\.(?P<time>.*?)"
                               "\\.manifest"
                               "(?P<partial>(\\.part))?"
                               "($|\\.)")
 
-    full_manifest_re_short = re.compile("^" + globals.file_prefix + "df"
+    full_manifest_re_short = re.compile("^" + globals.file_prefix + globals.manifest_file_prefix + "df"
                                     "\\.(?P<time>[0-9a-z]+?)"
                                     "\\.m"
                                     "(?P<partial>(\\.p))?"
                                     "($|\\.)")
 
-    inc_vol_re = re.compile("^" + globals.file_prefix + "duplicity-inc"
+    inc_vol_re = re.compile("^" + globals.file_prefix + globals.archive_file_prefix + "duplicity-inc"
                         "\\.(?P<start_time>.*?)"
                         "\\.to\\.(?P<end_time>.*?)"
                         "\\.vol(?P<num>[0-9]+)"
                         "\\.difftar"
                         "($|\\.)")
 
-    inc_vol_re_short = re.compile("^" + globals.file_prefix + "di"
+    inc_vol_re_short = re.compile("^" + globals.file_prefix + globals.archive_file_prefix + "di"
                               "\\.(?P<start_time>[0-9a-z]+?)"
                               "\\.(?P<end_time>[0-9a-z]+?)"
                               "\\.(?P<num>[0-9a-z]+)"
                               "\\.dt"
                               "($|\\.)")
 
-    inc_manifest_re = re.compile("^" + globals.file_prefix + "duplicity-inc"
+    inc_manifest_re = re.compile("^" + globals.file_prefix + globals.manifest_file_prefix + "duplicity-inc"
                              "\\.(?P<start_time>.*?)"
                              "\\.to"
                              "\\.(?P<end_time>.*?)"
@@ -103,26 +103,26 @@
                              "(?P<partial>(\\.part))?"
                              "(\\.|$)")
 
-    inc_manifest_re_short = re.compile("^" + globals.file_prefix + "di"
+    inc_manifest_re_short = re.compile("^" + globals.file_prefix + globals.manifest_file_prefix + "di"
                                    "\\.(?P<start_time>[0-9a-z]+?)"
                                    "\\.(?P<end_time>[0-9a-z]+?)"
                                    "\\.m"
                                    "(?P<partial>(\\.p))?"
                                    "(\\.|$)")
 
-    full_sig_re = re.compile("^" + globals.file_prefix + "duplicity-full-signatures"
+    full_sig_re = re.compile("^" + globals.file_prefix + globals.sig_file_prefix + "duplicity-full-signatures"
                          "\\.(?P<time>.*?)"
                          "\\.sigtar"
                          "(?P<partial>(\\.part))?"
                          "(\\.|$)")
 
-    full_sig_re_short = re.compile("^" + globals.file_prefix + "dfs"
+    full_sig_re_short = re.compile("^" + globals.file_prefix + globals.sig_file_prefix + "dfs"
                                "\\.(?P<time>[0-9a-z]+?)"
                                "\\.st"
                                "(?P<partial>(\\.p))?"
                                "(\\.|$)")
 
-    new_sig_re = re.compile("^" + globals.file_prefix + "duplicity-new-signatures"
+    new_sig_re = re.compile("^" + globals.file_prefix + globals.sig_file_prefix + "duplicity-new-signatures"
                         "\\.(?P<start_time>.*?)"
                         "\\.to"
                         "\\.(?P<end_time>.*?)"
@@ -130,7 +130,7 @@
                         "(?P<partial>(\\.part))?"
                         "(\\.|$)")
 
-    new_sig_re_short = re.compile("^" + globals.file_prefix + "dns"
+    new_sig_re_short = re.compile("^" + globals.file_prefix + globals.sig_file_prefix + "dns"
                               "\\.(?P<start_time>[0-9a-z]+?)"
                               "\\.(?P<end_time>[0-9a-z]+?)"
                               "\\.st"
@@ -218,18 +218,18 @@
         assert not (volume_number and part_string)
         if type == "full-sig":
             if globals.short_filenames:
-                return ("dfs.%s.st%s%s" %
+                return (globals.sig_file_prefix + "dfs.%s.st%s%s" %
                         (to_base36(dup_time.curtime), part_string, suffix))
             else:
-                return ("duplicity-full-signatures.%s.sigtar%s%s" %
+                return (globals.sig_file_prefix + "duplicity-full-signatures.%s.sigtar%s%s" %
                         (dup_time.curtimestr, part_string, suffix))
         elif type == "new-sig":
             if globals.short_filenames:
-                return ("dns.%s.%s.st%s%s" %
+                return (globals.sig_file_prefix + "dns.%s.%s.st%s%s" %
                         (to_base36(dup_time.prevtime), to_base36(dup_time.curtime),
                          part_string, suffix))
             else:
-                return ("duplicity-new-signatures.%s.to.%s.sigtar%s%s" %
+                return (globals.sig_file_prefix + "duplicity-new-signatures.%s.to.%s.sigtar%s%s" %
                         (dup_time.prevtimestr, dup_time.curtimestr,
                          part_string, suffix))
     else:
@@ -240,25 +240,27 @@
                 vol_string = "%s.dt" % to_base36(volume_number)
             else:
                 vol_string = "vol%d.difftar" % volume_number
+            prefix = globals.archive_file_prefix
         else:
             if globals.short_filenames:
                 vol_string = "m"
             else:
                 vol_string = "manifest"
+            prefix = globals.manifest_file_prefix
         if type == "full":
             if globals.short_filenames:
-                return ("df.%s.%s%s%s" % (to_base36(dup_time.curtime),
+                return ("%sdf.%s.%s%s%s" % (prefix, to_base36(dup_time.curtime),
                                           vol_string, part_string, suffix))
             else:
-                return ("duplicity-full.%s.%s%s%s" % (dup_time.curtimestr,
+                return ("%sduplicity-full.%s.%s%s%s" % (prefix, dup_time.curtimestr,
                                                       vol_string, part_string, suffix))
         elif type == "inc":
             if globals.short_filenames:
-                return ("di.%s.%s.%s%s%s" % (to_base36(dup_time.prevtime),
+                return ("%sdi.%s.%s.%s%s%s" % (prefix, to_base36(dup_time.prevtime),
                                              to_base36(dup_time.curtime),
                                              vol_string, part_string, suffix))
             else:
-                return ("duplicity-inc.%s.to.%s.%s%s%s" % (dup_time.prevtimestr,
+                return ("%sduplicity-inc.%s.to.%s.%s%s%s" % (prefix, dup_time.prevtimestr,
                                                            dup_time.curtimestr,
                                                            vol_string, part_string, suffix))
         else:

=== modified file 'duplicity/globals.py'
--- duplicity/globals.py	2014-01-21 16:34:00 +0000
+++ duplicity/globals.py	2014-01-02 23:40:18 +0000
@@ -31,6 +31,15 @@
 # Default file_prefix value
 file_prefix = ""
 
+# Prefix for manifest files only
+manifest_file_prefix = ""
+
+# Prefix for archive files only
+archive_file_prefix = ""
+
+# Prefix for sig files only
+sig_file_prefix = ""
+
 # The name of the current host, or None if it cannot be set
 hostname = socket.getfqdn()