[Piuparts-commits] rev 551 - in trunk: . debian

[Holger Levsen]

Author: holger
Date: 2009-12-09 09:56:14 +0000 (Wed, 09 Dec 2009)
New Revision: 551

Modified:
   trunk/TODO
   trunk/debian/NEWS
   trunk/debian/changelog
   trunk/piuparts.1.txt
   trunk/piuparts.py
Log:
    In the chroots, APT::Get::AllowUnauthenticated is set accordingly in
    /etc/apt/apt.conf.

Modified: trunk/TODO
===================================================================
--- trunk/TODO	2009-12-08 14:33:46 UTC (rev 550)
+++ trunk/TODO	2009-12-09 09:56:14 UTC (rev 551)
@@ -2,7 +2,7 @@
 =========================
 
 
-for 0.37 and 0.38 (split this list):
+for 0.38 and later (split this list):
 
 - move logfiles from bugged to archived if a newer version exists in pass
 - move logfiles from fail to bugged if a lower version exists in bugged
@@ -82,7 +82,7 @@
   and not be included in the python source
 
 - write reportbug wrapper for mass bug filing (start simple, make it more sophisticated 
-  in 0.38)
+  later)
 
 - publish FAI classes to setup piuparts.$fqdn automatically 
 
@@ -92,7 +92,6 @@
 
 - a redirect of http://piuparts.d.o/foo to http://p.d.o/source/f/foo.html would be nice
 
-- release 0.37 before debconf9
 
 for 0.39 and on:
 

Modified: trunk/debian/NEWS
===================================================================
--- trunk/debian/NEWS	2009-12-08 14:33:46 UTC (rev 550)
+++ trunk/debian/NEWS	2009-12-09 09:56:14 UTC (rev 551)
@@ -7,6 +7,8 @@
    * 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.
+     In the chroots, APT::Get::AllowUnauthenticated is set accordingly in
+     /etc/apt/apt.conf.
 
  -- Holger Levsen <holger at debian.org>  Mon, 07 Dec 2009 19:18:07 +0100
 

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-12-08 14:33:46 UTC (rev 550)
+++ trunk/debian/changelog	2009-12-09 09:56:14 UTC (rev 551)
@@ -16,6 +16,8 @@
       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.
   * 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 14:33:46 UTC (rev 550)
+++ trunk/piuparts.1.txt	2009-12-09 09:56:14 UTC (rev 551)
@@ -186,9 +186,9 @@
 
 AUTHOR
 ------
-Lars Wirzenius (liw at iki.fi)
+Lars Wirzenius (liw at iki.fi) and others
 
 DATE
 ----
-2005-07-10
+2009-12-08
 

Modified: trunk/piuparts.py
===================================================================
--- trunk/piuparts.py	2009-12-08 14:33:46 UTC (rev 550)
+++ trunk/piuparts.py	2009-12-09 09:56:14 UTC (rev 551)
@@ -647,10 +647,10 @@
     def create_apt_conf(self):
         """Create /etc/apt/apt.conf inside the chroot."""
         create_file(self.relative("etc/apt/apt.conf"),
-                    'APT::Get::AllowUnauthenticated "yes";\n' + 
+                    'APT::Get::AllowUnauthenticated "%s";\n' + 
                     'APT::Get::Assume-Yes "yes";\n' +
                     'APT::Install-Recommends "0";\n' +
-                    'APT::Install-Suggests "0";\n')
+                    'APT::Install-Suggests "0";\n' % settings.apt_unauthenticated)
 
     def create_policy_rc_d(self):
         """Create a policy-rc.d that prevents daemons from running."""
@@ -1921,8 +1921,10 @@
     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"
     
     log_file_name = opts.log_file