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

[Holger Levsen]

Author: holger
Date: 2010-04-21 10:04:19 +0000 (Wed, 21 Apr 2010)
New Revision: 680

Modified:
   trunk/debian/changelog
   trunk/piuparts.py
Log:
fix --do-not-verify-signatures option (Closes: #574936) - thanks to
Cleto Martin Angelina for the patch.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-04-20 13:26:20 UTC (rev 679)
+++ trunk/debian/changelog	2010-04-21 10:04:19 UTC (rev 680)
@@ -38,6 +38,8 @@
     - create temporary DEBIAN directory for the piuparts-depends-dummy package
       with 0755 perms regardless of the umask of the calling shell. 
       (Closes: #573904)
+    - fix --do-not-verify-signatures option (Closes: #574936) - thanks to
+      Cleto Martin Angelina for the patch.
   * Add ${misc:Depends} to Depends in debian/control. 
   * Makefile: support python 2.5 and 2.6 instead of 2.4 and 2.5, adjust
     debian/control accordingly.

Modified: trunk/piuparts.py
===================================================================
--- trunk/piuparts.py	2010-04-20 13:26:20 UTC (rev 679)
+++ trunk/piuparts.py	2010-04-21 10:04:19 UTC (rev 680)
@@ -50,7 +50,7 @@
 import unittest
 import urllib
 import uuid
-from debian_bundle import deb822
+from debian import deb822
 
 
 class Defaults:
@@ -365,6 +365,7 @@
 def run(command, ignore_errors=False):
     """Run an external command and die with error message if it fails."""
     assert type(command) == type([])
+    command = [x for x in command if x] # Delete any empty argument
     logging.debug("Starting command: %s" % command)
     env = os.environ.copy()
     env["LC_ALL"] = "C"
@@ -1855,6 +1856,7 @@
 		      help="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 depending packages.")
      
     parser.add_option("--do-not-verify-signatures", default=False,
+                      action='store_true',
                       help="Do not verify signatures from the Release files when running debootstrap.")
 
     parser.add_option("-i", "--ignore", action="append", metavar="FILENAME",