Merge lp://staging/~brian-murray/apport/test-fix into lp://staging/~apport-hackers/apport/trunk
Status: | Merged |
---|---|
Merged at revision: | 2981 |
Proposed branch: | lp://staging/~brian-murray/apport/test-fix |
Merge into: | lp://staging/~apport-hackers/apport/trunk |
Diff against target: |
22 lines (+5/-3) 1 file modified
backends/packaging-apt-dpkg.py (+5/-3) |
To merge this branch: | bzr merge lp://staging/~brian-murray/apport/test-fix |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Pitt (community) | Approve | ||
Review via email: mp+264901@code.staging.launchpad.net |
Description of the change
Fix this:
There is one failure left with Python 2:
=======
ERROR: test_use_
Use a sources.list.d file for a PPA.
-------
Traceback (most recent call last):
File "test/test_
'ubuntu', 'trusty', origins=
File "backends/
ppa_info = apport.
File "/home/
return json.loads(content)
File "/usr/lib/
return _default_
File "/usr/lib/
obj, end = self.raw_decode(s, idx=_w(s, 0).end())
File "/usr/lib/
raise ValueError("No JSON object could be decoded")
ValueError: No JSON object could be decoded
Ah, I was grepping for HTTPError only, so I missed that spot. Pulled. Thanks Brian!