summaryrefslogtreecommitdiff
path: root/morphlib/morphset.py
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2013-09-26 11:20:34 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2013-09-26 11:21:09 +0000
commit151050c5b15e83cbfc6ac9fcd786dcb957022185 (patch)
treec3da24c1a3d3b2f2f76fb7c012cd7149d8729262 /morphlib/morphset.py
parent6a216934edb2423c9aa347329ea029041927a413 (diff)
downloadmorph-151050c5b15e83cbfc6ac9fcd786dcb957022185.tar.gz
Make branch commands work with null refs
Diffstat (limited to 'morphlib/morphset.py')
-rw-r--r--morphlib/morphset.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/morphlib/morphset.py b/morphlib/morphset.py
index 3c07d58e..9ef1e804 100644
--- a/morphlib/morphset.py
+++ b/morphlib/morphset.py
@@ -95,9 +95,11 @@ class MorphologySet(object):
repo_url, ref, morph = self._find_spec(
system_morph['strata'], stratum_name)
- if repo_url is None:
+ if (repo_url, ref, morph) == (None, None, None):
raise StratumNotInSystemError(system_morph['name'], stratum_name)
- m = self._get_morphology(repo_url, ref, '%s.morph' % morph)
+ m = self._get_morphology(repo_url or system_morph.repo_url,
+ ref or system_morph.ref,
+ '%s.morph' % morph)
if m is None:
raise StratumNotInSetError(stratum_name)
return m
@@ -118,7 +120,7 @@ class MorphologySet(object):
repo_url, ref, morph = self._find_spec(
stratum_morph['chunks'], chunk_name)
- if repo_url is None:
+ if (repo_url, ref, morph) == (None, None, None):
raise ChunkNotInStratumError(stratum_morph['name'], chunk_name)
return repo_url, ref, morph