[Piuparts-commits] rev 566 - in trunk: . debian
Holger Levsen
holger at alioth.debian.org
Wed Dec 16 20:41:16 UTC 2009
Author: holger
Date: 2009-12-16 20:41:16 +0000 (Wed, 16 Dec 2009)
New Revision: 566
Modified:
trunk/TODO
trunk/debian/changelog
trunk/piuparts.1.txt
trunk/piuparts.py
Log:
Introduce a new option, --minimize, to minimize a chroot with debfoster.
(This is the old default behaviour. In future versions the --minimize
option might be removed again.)
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2009-12-16 19:31:55 UTC (rev 565)
+++ trunk/TODO 2009-12-16 20:41:16 UTC (rev 566)
@@ -139,6 +139,10 @@
allow to override the commandline arguments of the used program (to be
able to test with and without recommended packages or authentication).
+* Remove --minimize and related options/functionality? Since 0.38 --skip-minimize
+ and --debfoster-options have become quite obsolete (--minimize has been added
+ in 0.38) since debootstrap now creates a minimal chroot.
+
* Kill children after a timeout to make sure the test doesn't run forever.
* #522913: include a test to see which packages which modify their own conffiles
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2009-12-16 19:31:55 UTC (rev 565)
+++ trunk/debian/changelog 2009-12-16 20:41:16 UTC (rev 566)
@@ -10,22 +10,23 @@
with --variant=minbase instead of --resolv-deps now and because if a
base.tgz or an lvm snapshot is specified, piuparts should not touch it.
(Closes: #539142)
- * TODO: decide whether to add a --minimize option or to remove the
- debfoster code.
- * Add two new options: --keyring to specify the keyring to use with
+ Introduce a new option, --minimize, to minimize a chroot with debfoster.
+ (This is the old default behaviour. In future versions the --minimize
+ option might be removed again.)
+ - Add two new options: --keyring to specify the keyring to use with
debootstrap (defaults to /usr/share/keyrings/debian-archive-keyring.gpg)
and --do-not-verify-signatures to not use --keyring with debootstrap.
(Closes: #545907)
In the chroots, APT::Get::AllowUnauthenticated is set accordingly in
/etc/apt/apt.conf.
- * Create policy-rc.d in 2nd chroot when using -b. (Closes: #466049)
+ - Create policy-rc.d in 2nd chroot when using -b. (Closes: #466049)
Thanks again to Patrick Schoenfeld for his help.
- * Add another type of custom-scripts, post_setup_, which are executed after
+ - Add another type of custom-scripts, post_setup_, which are executed after
the chroot was setup. (Closes: #466043)
- * Add new option, --pedantic-purge-test, to tell piuparts to be pedantic
+ - Add new option, --pedantic-purge-test, to tell piuparts to be pedantic
when checking if a purged package leaves files behind. If this option is
not set, files left in /tmp are ignored. (Closes: #528266)
- * Add new option, --dpkg-force-confdef, to make dpkg use --force-confdev,
+ - Add new option, --dpkg-force-confdef, to make dpkg use --force-confdev,
which lets dpkg always choose the default action when a modified conffile
is found. This options will make piuparts ignore errors it was designed
to report and therefore should only be used to hide problems in
Modified: trunk/piuparts.1.txt
===================================================================
--- trunk/piuparts.1.txt 2009-12-16 19:31:55 UTC (rev 565)
+++ trunk/piuparts.1.txt 2009-12-16 20:41:16 UTC (rev 566)
@@ -124,8 +124,11 @@
When processing changes files, piuparts will process the packages in each individual changes file seperately. This option will set piuparts to scan the packages of all changes files together along with any individual package files that may have been given on the command line.
*--skip-minimize*::
- Allow skip minimize chroot step. This is useful when you want to test several packages with piuparts. You can prepare a tarball already minimized and skip this step in all the tests.
+ Allow skip minimize chroot step. This is useful when you want to test several packages with piuparts. You can prepare a tarball already minimized and skip this step in all the tests. This is the default now.
+*--minimize*::
+ Minimize the chroot with debfoster. This used to be the default until #539142 was fixed.
+
*--skip-cronfiles-test*::
Skip testing the output from the cron files left in the system after remove a package.
Modified: trunk/piuparts.py
===================================================================
--- trunk/piuparts.py 2009-12-16 19:31:55 UTC (rev 565)
+++ trunk/piuparts.py 2009-12-16 20:41:16 UTC (rev 566)
@@ -682,13 +682,8 @@
def minimize(self):
"""Minimize a chroot by removing (almost all) unnecessary packages"""
- if False:
- logging.debug("NOT minimizing chroot because of dpkg bug")
- return
-
- if settings.skip_minimize:
+ if settings.skip_minimize or not settings.minimize:
return
-
self.run(["apt-get", "install", "debfoster"])
self.run(["debfoster"] + settings.debfoster_options)
remove_files([self.relative("var/lib/debfoster/keepers")])
@@ -1888,8 +1883,12 @@
parser.add_option("--skip-minimize",
action="store_true", default=True,
- help="Skip minimize chroot step.")
+ help="Skip minimize chroot step. This is the default now.")
+ parser.add_option("--minimize",
+ action="store_true", default=False,
+ help="Minimize chroot with debfoster. This used to be the default until #539142 was fixed.")
+
parser.add_option("--scriptsdir", metavar="DIR",
help="Directory where are placed the custom scripts.")
@@ -1932,6 +1931,7 @@
settings.single_changes_list = opts.single_changes_list
settings.keep_sources_list = opts.keep_sources_list
settings.skip_minimize = opts.skip_minimize
+ settings.minimize = opts.minimize
settings.list_installed_files = opts.list_installed_files
settings.no_upgrade_test = opts.no_upgrade_test
settings.skip_cronfiles_test = opts.skip_cronfiles_test
More information about the Piuparts-commits
mailing list