[Piuparts-commits] [SCM] piuparts git repository branch, piatti, updated. 0.44-755-ga3ab31d
Andreas Beckmann
debian at abeckmann.de
Mon Jun 18 11:37:54 UTC 2012
The following commit has been merged in the piatti branch:
commit 63b2803969560c72ddd8c49b02ec77c0b3b2c03c
Author: Andreas Beckmann <debian at abeckmann.de>
Date: Thu Jun 14 23:38:31 2012 +0200
p: --minimize: don't remove eatmydata
append eatmydata to the debfoster command line unless --no-eatmydata is set
Signed-off-by: Andreas Beckmann <debian at abeckmann.de>
diff --git a/debian/changelog b/debian/changelog
index 40aa2b5..46d53c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -61,6 +61,7 @@ piuparts (0.45) UNRELEASED; urgency=low
- Let Chroot register/de-register the cleanup panic handler.
- Remove temp_tgz on error exit.
- Remove metapackage build directory on error exit. (Closes: #663702)
+ - Don't remove eatmydata when minimizing a chroot. (Closes: #658962)
* piuparts.conf:
- Make master-command a [global] instead of a [section] setting.
The section name will be given as an argument to this command.
diff --git a/piuparts.py b/piuparts.py
index b00ab19..6aae953 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -963,7 +963,10 @@ class Chroot:
if settings.skip_minimize or not settings.minimize:
return
self.run(["apt-get", "install", "debfoster"])
- self.run(["debfoster"] + settings.debfoster_options)
+ debfoster_command = ["debfoster"] + settings.debfoster_options
+ if settings.eatmydata:
+ debfoster_command.append("eatmydata")
+ self.run(debfoster_command)
remove_files([self.relative("var/lib/debfoster/keepers")])
self.run(["dpkg", "--purge", "debfoster"])
--
piuparts git repository
More information about the Piuparts-commits
mailing list