summaryrefslogtreecommitdiff
path: root/morphlib/cachedrepo.py
diff options
context:
space:
mode:
authorJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-04-10 12:02:11 +0100
committerJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-04-10 12:24:48 +0100
commitb3d622bb295b9fbd4f29727d5af2f8293a97b5fd (patch)
tree29d63a7c13cb5c6fc263070c648167a98eea2429 /morphlib/cachedrepo.py
parentc3d3e041382d3784c8007ce1b93d431ba575654e (diff)
downloadmorph-b3d622bb295b9fbd4f29727d5af2f8293a97b5fd.tar.gz
Various small fixes to make the new update-gits work again.
Diffstat (limited to 'morphlib/cachedrepo.py')
-rw-r--r--morphlib/cachedrepo.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/morphlib/cachedrepo.py b/morphlib/cachedrepo.py
index df0ebf9d..37c53c7b 100644
--- a/morphlib/cachedrepo.py
+++ b/morphlib/cachedrepo.py
@@ -106,7 +106,7 @@ class CachedRepo(object):
if not self.is_valid_sha1(ref):
raise InvalidReferenceError(self, ref)
try:
- return self._rev_list(ref)
+ return self._rev_list(ref).strip()
except morphlib.execute.CommandFailure:
raise InvalidReferenceError(self, ref)
@@ -123,7 +123,7 @@ class CachedRepo(object):
if not self.is_valid_sha1(ref):
raise UnresolvedNamedReferenceError(self, ref)
try:
- sha1 = self._rev_list(ref)
+ sha1 = self._rev_list(ref).strip()
except morphlib.execute.CommandFailure:
raise InvalidReferenceError(self, ref)
@@ -154,7 +154,7 @@ class CachedRepo(object):
os.mkdir(target_dir)
try:
- sha1 = self._rev_list(ref)
+ sha1 = self._rev_list(ref).strip()
except morphlib.execute.CommandFailure:
raise InvalidReferenceError(self, ref)