diff options
Diffstat (limited to 'minidinstall/DebianSigVerifier.py')
| -rw-r--r-- | minidinstall/DebianSigVerifier.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/minidinstall/DebianSigVerifier.py b/minidinstall/DebianSigVerifier.py index d441a58..17a6ec2 100644 --- a/minidinstall/DebianSigVerifier.py +++ b/minidinstall/DebianSigVerifier.py @@ -2,7 +2,7 @@ # A class for verifying signed files, using Debian keys -# Copyright © 2002 Colin Walters <walters@gnu.org> +# Copyright (c) 2002 Colin Walters <walters@gnu.org> # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -18,18 +18,19 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -import os, re, sys, string, stat, logging -from minidinstall.GPGSigVerifier import GPGSigVerifier +import os +from .GPGSigVerifier import * class DebianSigVerifier(GPGSigVerifier): _dpkg_ring = '/etc/dpkg/local-keyring.gpg' + def __init__(self, keyrings=None, extra_keyrings=None): - if keyrings is None: + if not keyrings: keyrings = ['/usr/share/keyrings/debian-keyring.gpg', '/usr/share/keyrings/debian-keyring.pgp'] if os.access(self._dpkg_ring, os.R_OK): keyrings.append(self._dpkg_ring) - if not extra_keyrings is None: - keyrings += extra_keyrings + if extra_keyrings: + keyrings.extend(extra_keyrings) GPGSigVerifier.__init__(self, keyrings) # vim:ts=4:sw=4:et: |