diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-05-27 16:40:14 +0000 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-05-27 16:40:14 +0000 |
commit | fc56e7d8c4bc712709be3ecf290d775d3dbf9996 (patch) | |
tree | 828172b053affeed56a02a18ce66c9820a5fe388 /morphlib/app.py | |
parent | 13c5ab5a0bd17cc4cd5d0abcae8d9c25ffb29fde (diff) | |
parent | 9ce4af1dd730afd1c875ab9763d56bfa14728296 (diff) | |
download | morph-fc56e7d8c4bc712709be3ecf290d775d3dbf9996.tar.gz |
Merge branch 'ps/to-trove-id'
Changed Paul's patch so that --trove-prefix still works as an alias.
Diffstat (limited to 'morphlib/app.py')
-rwxr-xr-x | morphlib/app.py | 6 |
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'], |