summaryrefslogtreecommitdiff
path: root/morphlib
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-04-24 13:32:19 +0100
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-04-24 13:32:19 +0100
commit4198108ef0b09566fe26a251bcf16fc81b06e7e8 (patch)
tree5adf6f13965ccfbd4b10c1c61e70d1965e9ae332 /morphlib
parentb453fdcb08b3b8400368d0fba2a6fce9b778d03a (diff)
downloadmorph-4198108ef0b09566fe26a251bcf16fc81b06e7e8.tar.gz
Fix fix of submodule checkouts
Diffstat (limited to 'morphlib')
-rw-r--r--morphlib/builder2.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/morphlib/builder2.py b/morphlib/builder2.py
index 6f24e7af..b5ef89e3 100644
--- a/morphlib/builder2.py
+++ b/morphlib/builder2.py
@@ -138,8 +138,9 @@ class ChunkBuilder(BuilderBase):
# FIXME: This is ugly, but the best I can do atm. We need
# to combine sub.path, which is a relative path, with the
# directory in the cache where the git repos are. --liw
- sub_path = os.path.join(cache_dir, sub.path)
- return [(sub_path, sub.commit, os.path.join(destdir, sub.path))
+ return [(os.path.join(cache_dir, sub.path),
+ sub.commit,
+ os.path.join(destdir, sub.path))
for sub in submodules]
s = self.artifact.source