[Piuparts-commits] [piuparts] 08/08: p: fix --do-not-verify-signatures interaction with debootstrap

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit a254dda2140e033f5669489a0207ab393ba50aea
Author: Andreas Beckmann <anbe at debian.org>
Date:   Wed Apr 8 17:46:12 2015 +0200

    p: fix --do-not-verify-signatures interaction with debootstrap
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
 debian/changelog | 2 ++
 piuparts.py      | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 35129b9..c25b656 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ piuparts (0.63) UNRELEASED; urgency=medium
     - Mount /dev/pts into the chroot. Wanted by recent apt.
     - Fix usage of schroot with chroot names without ':'.  (Closes: #773874)
     - Resolve distro aliases before setting PIUPARTS_DISTRIBUTION.
+    - Fix running debootstrap if --do-not-verify-signatures is given.
+      (Closes: #781673)
   * piuparts.conf:
     - Enable --warn-on-debsums-errors for all jessie tests.
     - Add new suite: jessie-pu (test only packages in jessie-proposed-updates).
diff --git a/piuparts.py b/piuparts.py
index 7f1e5fe..2d26975 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -977,9 +977,11 @@ class Chroot:
         prefix = []
         if settings.eatmydata and os.path.isfile('/usr/bin/eatmydata'):
             prefix.append('eatmydata')
+        options = []
         if settings.do_not_verify_signatures:
             logging.info("Warning: not using --keyring option when running debootstrap!")
-        options = [settings.keyringoption]
+        else:
+            options.append("--keyring=%s" % settings.keyring)
         if settings.eatmydata:
             options.append('--include=eatmydata')
         options.append('--components=%s' % ','.join(settings.debian_mirrors[0][1]))
@@ -2862,10 +2864,8 @@ def parse_command_line():
         settings.keyring = defaults.get_keyring()
     settings.do_not_verify_signatures = opts.do_not_verify_signatures
     if settings.do_not_verify_signatures:
-        settings.keyringoption=""
         settings.apt_unauthenticated="Yes"
     else:
-        settings.keyringoption="--keyring=%s" % settings.keyring
         settings.apt_unauthenticated="No"
     settings.install_recommends = opts.install_recommends
     settings.eatmydata = not opts.no_eatmydata

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git