← Back to branch summary

~ubuntu-branches/ubuntu/vivid/python-apt/vivid-proposed

« back to all changes in this revision

Viewing changes to apt/auth.py

  • Committer: Package Import Robot
  • Author(s): Michael Vogt, Michael Vogt, Julian Andres Klode, Mauricio Faria de Oliveira
  • Date: 2014-08-28 14:46:57 UTC
  • mfrom: (2.3.47 sid)
  • Revision ID: package-import@ubuntu.com-20140828144657-b6vy9blpgbk9aurv
Tags: 0.9.3.9
https://launchpad.net/bugs/1308670
http://bugs.debian.org/755342
[ Michael Vogt ]
* fix another pep8 failure

[ Julian Andres Klode ]
* doc/source/tutorials/apt-get.rst: Remove -s from --print-uris invocation
  (LP: #1308670)

[ Mauricio Faria de Oliveira ]
* tests/test_pep8.py: --ignore E129 too (fix FTBFS with pep8 >= 1.5)
* tests/test_auth.py: update for gnupg 1.4.18 (Closes: #755342)

Show diffs side-by-side

added added

removed removed

Lines of Context:
apt/auth.py
154
154
    if res != 0:
155
155
        raise AptKeyError("recv from '%s' failed for '%s'" % (
156
156
            keyserver, keyid))
 
157
    # FIXME:
 
158
    # - with gnupg 1.4.18 the downloaded key is actually checked(!),
 
159
    #   i.e. gnupg will not import anything that the server sends
 
160
    #   into the keyring, so the below checks are now redundant *if*
 
161
    #   gnupg 1.4.18 is used
 
162
 
157
163
    # now export again using the long key id (to ensure that there is
158
164
    # really only this one key in our keyring) and not someone MITM us
159
165
    tmp_export_keyring = os.path.join(tmp_keyring_dir, "export-keyring.gpg")