summaryrefslogtreecommitdiff
path: root/morphlib/repoaliasresolver.py
diff options
context:
space:
mode:
authorDaniel Silverstone (br7vm) <daniel.silverstone@codethink.co.uk>2013-05-28 16:10:17 +0000
committerDaniel Silverstone (br7vm) <daniel.silverstone@codethink.co.uk>2013-05-28 16:10:17 +0000
commitad28474a0334e60e9036050c625b4a2341f33462 (patch)
treefd6b214cae54c24e539505587cd4f01a33150544 /morphlib/repoaliasresolver.py
parent5df056c4c06f2a74ed4d5ee965c5bcf237295c58 (diff)
downloadmorph-ad28474a0334e60e9036050c625b4a2341f33462.tar.gz
REPOALIAS: Update repo alias to support dashes and to be more strict.
Now, repo aliases must meet [a-z][a-z0-9-]+ rather than just [a-z0-9]+
Diffstat (limited to 'morphlib/repoaliasresolver.py')
-rw-r--r--morphlib/repoaliasresolver.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/morphlib/repoaliasresolver.py b/morphlib/repoaliasresolver.py
index 653eba90..5ade0639 100644
--- a/morphlib/repoaliasresolver.py
+++ b/morphlib/repoaliasresolver.py
@@ -45,7 +45,7 @@ class RepoAliasResolver(object):
def __init__(self, aliases):
self.aliases = {}
- alias_pattern = (r'^(?P<prefix>[a-z0-9]+)'
+ alias_pattern = (r'^(?P<prefix>[a-z][a-z0-9-]+)'
r'=(?P<pullpat>[^#]+)#(?P<pushpat>[^#]+)$')
for alias in aliases:
logging.debug('expanding: alias="%s"' % alias)
@@ -109,7 +109,7 @@ class RepoAliasResolver(object):
'''
- pat = r'^(?P<prefix>[a-z0-9]+):(?P<rest>.*)$'
+ pat = r'^(?P<prefix>[a-z][a-z0-9-]+):(?P<rest>.*)$'
m = re.match(pat, reponame)
if m:
return m.group('prefix'), m.group('rest')