Changeset 1231 in tailor

Timestamp:

08/08/06 21:57:55 (7 years ago)

Author:

lele@…

Hash name:

20060808195755-97f81-cc7edc6d0ef69b2dc6870a4e7050d2092def69e1

Message:

When loading options, fallback to either "source-xxx" or "target-xxx"

File:

• vcpx/repository/monotone.py (modified) (1 diff)

vcpx/repository/monotone.py

@@ -38 +38 @@
         cget = project.config.get
         self.EXECUTABLE = cget(self.name, 'monotone-command', 'mtn')
-        self.keyid = cget(self.name, 'keyid')
-        self.passphrase = cget(self.name, 'passphrase')
-        self.keyfile = cget(self.name, 'keyfile')
-        self.keygenid = cget(self.name, 'keygenid')
-        self.custom_lua = cget(self.name, 'custom_lua')
+        self.keyid = cget(self.name, 'keyid') or \
+                     cget(self.name, '%s-keyid' % self.which)
+        self.passphrase = cget(self.name, 'passphrase') or \
+                          cget(self.name, '%s-passphrase' % self.which)
+        self.keyfile = cget(self.name, 'keyfile') or \
+                       cget(self.name, '%s-keyfile' % self.which)
+        self.keygenid = cget(self.name, 'keygenid') or \
+                        cget(self.name, '%s-keygenid' % self.which)
+        self.custom_lua = cget(self.name, 'custom_lua') or \
+                          cget(self.name, '%s-custom_lua' % self.which)
 
     def create(self):