Fix replicate.py for single db to single db

djc · djc · commit f06a3a5b2b86 · 2014-07-07T11:55:40.000+02:00
diff --git a/couchdb/tools/replicate.py b/couchdb/tools/replicate.py
@@ -81,17 +81,22 @@ def main():
 
     if '*' in tpath:
         raise parser.error('invalid target path: must be single db or empty')
-    elif '*' in spath and tpath:
-        raise parser.error('target path must be empty with multiple sources')
 
     all = sorted(i for i in source if i[0] != '_') # Skip reserved names.
     if not spath:
         raise parser.error('source database must be specified')
 
-    databases = [(i, i) for i in all if fnmatch.fnmatchcase(i, spath)]
-    if not databases:
+    sources = [i for i in all if fnmatch.fnmatchcase(i, spath)]
+    if not sources:
         raise parser.error("no source databases match glob '%s'" % spath)
 
+    if len(sources) > 1 and tpath:
+        raise parser.error('target path must be empty with multiple sources')
+    elif len(sources) == 1:
+        databases = [(sources[0], tpath)]
+    else:
+        databases = [(i, i) for i in sources]
+
     # do the actual replication
 
     for sdb, tdb in databases:
