Merge lp://staging/~mvo/software-properties/use-apt-auth into lp://staging/software-properties

Proposed by Michael Vogt
Status: Needs review
Proposed branch: lp://staging/~mvo/software-properties/use-apt-auth
Merge into: lp://staging/software-properties
Diff against target: 175 lines (+23/-87)
3 files modified
debian/changelog (+6/-0)
debian/control (+2/-2)
softwareproperties/ppa.py (+15/-85)
To merge this branch: bzr merge lp://staging/~mvo/software-properties/use-apt-auth
Reviewer Review Type Date Requested Status
Barry Warsaw (community) Needs Fixing
Adam Conrad Pending
Review via email: mp+127568@code.staging.launchpad.net

Description of the change

Use apt.auth from python-apt that does the same kind of checks
nowdays

To post a comment you must log in.
Revision history for this message
Barry Warsaw (barry) wrote :

Any chance of getting http://apt.alioth.debian.org/python-apt-doc/contents.html updated? It only covers 0.8.0 and doesn't describe apt.auth at all afaict. Or is there a better, more definitive location for the documentation?

Revision history for this message
Barry Warsaw (barry) wrote :

Note that the pre-build hook fails when trying to build a source package with this branch. I suspect the test mocks need to be fixed for the new implementation.

Testing ./test_lp.py /home/barry/projects/ubuntu/softprop/build-area/software-properties-0.92.14/tests with python 2
EEEError getting key from keyserver: Only long keyids (v4, 160bit) are supported
...
======================================================================
ERROR: test_add_ppa_signing_key_multiple_fingerprints (__main__.AddPPASigningKeyTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/mock.py", line 1224, in patched
    return func(*args, **keywargs)
  File "./test_lp.py", line 76, in test_add_ppa_signing_key_multiple_fingerprints
    with patch.object(self.t, "_get_fingerprints") as mock:
  File "/usr/lib/python2.7/dist-packages/mock.py", line 1275, in __enter__
    original, local = self.get_original()
  File "/usr/lib/python2.7/dist-packages/mock.py", line 1263, in get_original
    "%s does not have the attribute %r" % (target, name)
AttributeError: <AddPPASigningKeyThread(Thread-1, initial)> does not have the attribute '_get_fingerprints'

======================================================================
ERROR: test_add_ppa_signing_key_ok (__main__.AddPPASigningKeyTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/mock.py", line 1224, in patched
    return func(*args, **keywargs)
  File "./test_lp.py", line 89, in test_add_ppa_signing_key_ok
    with patch.object(self.t, "_get_fingerprints") as mock:
  File "/usr/lib/python2.7/dist-packages/mock.py", line 1275, in __enter__
    original, local = self.get_original()
  File "/usr/lib/python2.7/dist-packages/mock.py", line 1263, in get_original
    "%s does not have the attribute %r" % (target, name)
AttributeError: <AddPPASigningKeyThread(Thread-2, initial)> does not have the attribute '_get_fingerprints'

======================================================================
ERROR: test_add_ppa_signing_key_wrong_fingerprint (__main__.AddPPASigningKeyTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/mock.py", line 1224, in patched
    return func(*args, **keywargs)
  File "./test_lp.py", line 65, in test_add_ppa_signing_key_wrong_fingerprint
    with patch.object(self.t, "_get_fingerprints") as mock:
  File "/usr/lib/python2.7/dist-packages/mock.py", line 1275, in __enter__
    original, local = self.get_original()
  File "/usr/lib/python2.7/dist-packages/mock.py", line 1263, in get_original
    "%s does not have the attribute %r" % (target, name)
AttributeError: <AddPPASigningKeyThread(Thread-3, initial)> does not have the attribute '_get_fingerprints'

----------------------------------------------------------------------
Ran 6 tests in 1.322s

FAILED (errors=3)
make: *** [check] Error 1
bzr: ERROR: The "pre-build" hook failed.

review: Needs Fixing

Unmerged revisions

813. By Michael Vogt

use apt.auth.add_key_from_keyserver() and upate debian/control

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: