Merge branch 'ps/to-trove-id'

Changed Paul's patch so that --trove-prefix still works as an alias.

1 files changed, 3 insertions, 3 deletions

diff --git a/morphlib/app.py b/morphlib/app.py
index 859019f9..e6d8b332 100755
--- a/morphlib/app.py
+++ b/morphlib/app.py
@@ -27,7 +27,7 @@ import morphlib
 
 defaults = {
     'trove-host': 'git.baserock.org',
-    'trove-prefix': [ ],
+    'trove-id': [],
     'repo-alias': [
         ('freedesktop='
             'git://anongit.freedesktop.org/#'
@@ -70,11 +70,11 @@ class Morph(cliapp.Application):
                              'hostname of Trove instance',
                              metavar='TROVEHOST',
                              default=defaults['trove-host'])
-        self.settings.string_list(['trove-prefix'],
+        self.settings.string_list(['trove-id', 'trove-prefix'],
                                   'list of URL prefixes that should be '
                                   'resolved to Trove',
                                   metavar='PREFIX, ...',
-                                  default=defaults['trove-prefix'])
+                                  default=defaults['trove-id'])
 
         group_advanced = 'Advanced Options'
         self.settings.boolean(['no-git-update'],