summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2012-05-05 09:54:42 -0400
committerColin Walters <walters@verbum.org>2012-05-05 09:54:42 -0400
commitba1c75c61b8c950f61f6239bed997cf0417a817d (patch)
tree5dfea64e20b9b765f49e79e6c37a73edd9f0d466
parente213e2b5dfe0aafc1a4cbb6d7410b646c7fbf002 (diff)
downloadostree-ba1c75c61b8c950f61f6239bed997cf0417a817d.tar.gz
ostbuild: Drop use of link cache, it's gone now
-rwxr-xr-xsrc/ostbuild/pyostbuild/builtin_chroot_compile_one.py10
-rwxr-xr-xsrc/ostbuild/pyostbuild/builtin_compose.py6
2 files changed, 3 insertions, 13 deletions
diff --git a/src/ostbuild/pyostbuild/builtin_chroot_compile_one.py b/src/ostbuild/pyostbuild/builtin_chroot_compile_one.py
index 85138632..318cdd39 100755
--- a/src/ostbuild/pyostbuild/builtin_chroot_compile_one.py
+++ b/src/ostbuild/pyostbuild/builtin_chroot_compile_one.py
@@ -71,9 +71,6 @@ class OstbuildChrootCompileOne(builtins.Builtin):
for ref,rev in zip(refs_to_resolve, resolved_refs):
ref_to_rev[ref] = rev
- link_cache_dir = os.path.join(self.workdir, 'link-cache')
- fileutil.ensure_dir(link_cache_dir)
-
sha = hashlib.sha256()
(fd, tmppath) = tempfile.mkstemp(suffix='.txt', prefix='ostbuild-buildroot-')
@@ -116,12 +113,9 @@ class OstbuildChrootCompileOne(builtins.Builtin):
log("composing buildroot from %d parents (last: %r)" % (len(checkout_trees),
checkout_trees[-1][0]))
- link_cache_dir = os.path.join(self.workdir, 'link-cache')
- fileutil.ensure_dir(link_cache_dir)
-
run_sync(['ostree', '--repo=' + self.repo,
- 'checkout', '--link-cache=' + link_cache_dir,
- '--user-mode', '--union', '--from-file=' + tmppath, rootdir_tmp])
+ 'checkout', '--user-mode', '--union',
+ '--from-file=' + tmppath, rootdir_tmp])
os.unlink(tmppath);
diff --git a/src/ostbuild/pyostbuild/builtin_compose.py b/src/ostbuild/pyostbuild/builtin_compose.py
index 52dbb8f8..dabb516b 100755
--- a/src/ostbuild/pyostbuild/builtin_compose.py
+++ b/src/ostbuild/pyostbuild/builtin_compose.py
@@ -68,12 +68,8 @@ class OstbuildCompose(builtins.Builtin):
f.write('\0')
f.close()
- link_cache_dir = os.path.join(self.workdir, 'link-cache')
- fileutil.ensure_dir(link_cache_dir)
-
run_sync(['ostree', '--repo=' + self.repo,
- 'checkout', '--link-cache=' + link_cache_dir,
- '--user-mode', '--no-triggers',
+ 'checkout', '--user-mode', '--no-triggers',
'--union', '--from-stdin', compose_rootdir],
stdin=open(tmppath))
os.unlink(tmppath)