[Piuparts-commits] rev 550 - in trunk: . debian
Holger Levsen
holger at alioth.debian.org
Tue Dec 8 14:33:54 UTC 2009
Author: holger
Date: 2009-12-08 14:33:46 +0000 (Tue, 08 Dec 2009)
New Revision: 550
Modified:
trunk/debian/NEWS
trunk/debian/changelog
trunk/piuparts.1.txt
trunk/piuparts.py
Log:
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)
Modified: trunk/debian/NEWS
===================================================================
--- trunk/debian/NEWS 2009-12-08 13:18:40 UTC (rev 549)
+++ trunk/debian/NEWS 2009-12-08 14:33:46 UTC (rev 550)
@@ -1,8 +1,12 @@
piuparts (0.38) UNRELEASED; urgency=low
- * --skip-minimize is now the default. This is because debootstrap is called
- 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.
+ * New default behaviours in piuparts:
+ * --skip-minimize is now the default. This is because debootstrap is called
+ 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.
+ * 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.
-- Holger Levsen <holger at debian.org> Mon, 07 Dec 2009 19:18:07 +0100
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2009-12-08 13:18:40 UTC (rev 549)
+++ trunk/debian/changelog 2009-12-08 14:33:46 UTC (rev 550)
@@ -11,7 +11,11 @@
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.
+ debfoster code.
+ * 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)
* piuparts-report: report broken symlinks.
* Makefile: workaround 559305 by calling a2x twice.
* debian/NEWS
Modified: trunk/piuparts.1.txt
===================================================================
--- trunk/piuparts.1.txt 2009-12-08 13:18:40 UTC (rev 549)
+++ trunk/piuparts.1.txt 2009-12-08 14:33:46 UTC (rev 550)
@@ -42,7 +42,7 @@
*-a, --apt*::
The package arguments on the command line are to be treated as package names and installed via *apt-get* instead of being names of package files, to be installed via *dpkg -i*.
-*-b tarball, --basetgz*='tarball'::
+*-b* tarball, *--basetgz*='tarball'::
Use tarball as the contents of the initial chroot, instead of building a new one with debootstrap.
+
The tarball can be created with the '-s' option, or you can use one that *pbuilder* has created (see '-p'). If you create one manually, make sure the root of the chroot is the root of the tarball.
@@ -62,6 +62,9 @@
*-D* 'flavor', *--defaults* 'flavor'::
Use default settings suitable for a particular flavor of Debian: either debian or ubuntu.
+*--do-not-verify-signatures*::
+ Do not verify signatures from the Release files when running debootstrap.
+
*-i* 'filename', *--ignore*='filename'::
Add a filename to the list of filenames to be ignored when comparing changes before and after installation. By default, piuparts ignores files that always change during a package installation and uninstallation, such as *dpkg* status files. The filename should be relative to the root of the chroot (e.g., _var/lib/dpkg/status_). This option can be used as many times as necessary.
@@ -71,6 +74,9 @@
*-k, --keep-tmpdir*::
Don't remove the temporary directory for the chroot when the program ends.
+*-K, --keyring*='filename'::
+ Use FILE as the keyring to use with debootstrap when creating chroots.
+
*--keep-sources-list*::
Don't modify the chroot's etc/apt/sources.list (only makes sense with '--basetgz').
Modified: trunk/piuparts.py
===================================================================
--- trunk/piuparts.py 2009-12-08 13:18:40 UTC (rev 549)
+++ trunk/piuparts.py 2009-12-08 14:33:46 UTC (rev 550)
@@ -151,6 +151,8 @@
self.check_broken_symlinks = True
self.warn_broken_symlinks = False
self.debfoster_options = None
+ self.keyring = "/usr/share/keyrings/debian-archive-keyring.gpg"
+ self.do_not_verify_signatures = False
self.ignored_files = [
"/dev/MAKEDEV",
"/etc/aliases",
@@ -661,7 +663,9 @@
"""Set up a minimal Debian system in a chroot."""
logging.debug("Setting up minimal chroot for %s at %s." %
(settings.debian_distros[0], self.name))
- run(["debootstrap", "--variant=minbase", settings.debian_distros[0],
+ if settings.do_not_verify_signatures:
+ logging.info("Warning: not using --keyring option when running debootstrap!")
+ run(["debootstrap", "--variant=minbase", settings.keyringoption, settings.debian_distros[0],
self.name, settings.debian_mirrors[0][0]])
def minimize(self):
@@ -1778,6 +1782,10 @@
default="-o MaxPriority=required -o UseRecommends=no -f -n apt debfoster",
help="Run debfoster with different parameters (default: -o MaxPriority=required -o UseRecommends=no -f -n apt debfoster).")
+ parser.add_option("--do-not-verify-signatures",
+ action="store_true", default=False,
+ help="Do not verify signatures from the Release files when running debootstrap.")
+
parser.add_option("-i", "--ignore", action="append", metavar="FILENAME",
default=[],
help="Add FILENAME to list of filenames to be " +
@@ -1793,6 +1801,10 @@
action="store_true", default=False,
help="Don't remove the temporary directory for the " +
"chroot when the program ends.")
+
+ parser.add_option("-K", "--keyring", metavar="FILE",
+ action="store_true",
+ help="Use FILE as the keyring to use with debootstrap when creating chroots.")
parser.add_option("--keep-sources-list",
action="store_true", default=False,
@@ -1905,6 +1917,13 @@
settings.list_installed_files = opts.list_installed_files
settings.no_upgrade_test = opts.no_upgrade_test
settings.skip_cronfiles_test = opts.skip_cronfiles_test
+ settings.keyring = opts.keyring
+ settings.do_not_verify_signatures = opts.do_not_verify_signatures
+ if settings.do_not_verify_signatures:
+ settings.keyringoption=""
+ else:
+ settings.keyringoption="--keyring %s" % settings.keyring
+
log_file_name = opts.log_file
defaults = DefaultsFactory().new_defaults()
More information about the Piuparts-commits
mailing list