diff options
| -rwxr-xr-x | morphlib/app.py | 6 | ||||
| -rw-r--r-- | morphlib/util.py | 18 | ||||
| -rwxr-xr-x | tests/trove-id.script (renamed from tests/trove-prefix.script) | 10 |
3 files changed, 17 insertions, 17 deletions
diff --git a/morphlib/app.py b/morphlib/app.py index 859019f9..88eff8db 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'], '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'], diff --git a/morphlib/util.py b/morphlib/util.py index c77ac8d3..b509f0b0 100644 --- a/morphlib/util.py +++ b/morphlib/util.py @@ -105,7 +105,7 @@ def new_artifact_caches(settings): # pragma: no cover def combine_aliases(app): # pragma: no cover '''Create a full repo-alias set from the app's settings.''' trove_host = app.settings['trove-host'] - trove_prefixes = app.settings['trove-prefix'] + trove_ids = app.settings['trove-id'] repo_aliases = app.settings['repo-alias'] repo_pat = r'^(?P<prefix>[a-z0-9]+)=(?P<pull>[^#]+)#(?P<push>[^#]+)$' trove_pat = (r'^(?P<prefix>[a-z0-9]+)=(?P<path>[^#]+)#' @@ -118,7 +118,7 @@ def combine_aliases(app): # pragma: no cover return "ssh://git@%s/%s/%%s" % (trove_host, path) else: raise cliapp.AppException( - 'Unknown protocol in trove_prefix: %s' % protocol) + 'Unknown protocol in trove_id: %s' % protocol) if trove_host: alias_map['baserock'] = "baserock=%s#%s" % ( @@ -127,18 +127,18 @@ def combine_aliases(app): # pragma: no cover alias_map['upstream'] = "upstream=%s#%s" % ( _expand('git', 'delta'), _expand('ssh', 'delta')) - for trove_prefix in trove_prefixes: - m = re.match(trove_pat, trove_prefix) + for trove_id in trove_ids: + m = re.match(trove_pat, trove_id) if m: alias_map[m.group('prefix')] = "%s=%s#%s" % ( m.group('prefix'), _expand(m.group('pull'), m.group('path')), _expand(m.group('push'), m.group('path'))) - elif '=' not in trove_prefix: - alias_map[trove_prefix] = "%s=%s#%s" % ( - trove_prefix, - _expand('ssh', trove_prefix), - _expand('ssh', trove_prefix)) + elif '=' not in trove_id: + alias_map[trove_id] = "%s=%s#%s" % ( + trove_id, + _expand('ssh', trove_id), + _expand('ssh', trove_id)) for repo_alias in repo_aliases: m = re.match(repo_pat, repo_alias) if m: diff --git a/tests/trove-prefix.script b/tests/trove-id.script index 0f8cee3f..7157559b 100755 --- a/tests/trove-prefix.script +++ b/tests/trove-id.script @@ -16,7 +16,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -## Verify that trove-prefix (and by corollary trove-host) work properly. +## Verify that trove-id (and by corollary trove-host) work properly. set -eu @@ -27,13 +27,13 @@ PROCESSEDDUMP="$DATADIR/processed-configdump" "$SRCDIR/scripts/test-morph" \ --trove-host="TROVEHOST" \ - --trove-prefix="fudge" \ - --trove-prefix="github" \ + --trove-id="fudge" \ + --trove-id="github" \ --dump-config > "$RAWDUMP" env MORPH_DUMP_PROCESSED_CONFIG=1 "$SRCDIR/scripts/test-morph" \ --trove-host="TROVEHOST" \ - --trove-prefix="fudge" \ - --trove-prefix="github" \ + --trove-id="fudge" \ + --trove-id="github" \ > "$PROCESSEDDUMP" RAW_ALIAS=$(grep repo-alias "$RAWDUMP" | cut -d\ -f3-) |