Apport

Merge lp:~brian-murray/apport/python-apt-hash into lp:~apport-hackers/apport/trunk

  1. python-apt-hash
  2. Merge into trunk
Proposed by Brian Murray
Status: Merged
Merged at revision: 2976
Proposed branch: lp:~brian-murray/apport/python-apt-hash
Merge into: lp:~apport-hackers/apport/trunk
Diff against target: 39 lines (+4/-4)
1 file modified
backends/packaging-apt-dpkg.py (+4/-4)
To merge this branch: bzr merge lp:~brian-murray/apport/python-apt-hash
Reviewer Review Type Date Requested Status
Martin Pitt (community) Approve
Review via email: mp+263176@code.launchpad.net

Description of the change

This fixes the following warning:

test_install_packages_from_launchpad (__main__.T)
install_packages() using packages only available on Launchpad ... backends/packaging-apt-dpkg.py:785: DeprecationWarning: Using the md5 keyword is deprecated, please use 'hash' instead
  destdir=archivedir))
backends/packaging-apt-dpkg.py:859: DeprecationWarning: Using the md5 keyword is deprecated, please use 'hash' instead
  destdir=archivedir))
backends/packaging-apt-dpkg.py:923: DeprecationWarning: Using the md5 keyword is deprecated, please use 'hash' instead
  destdir=archivedir))
ok

I guess that's what I get for bugging mvo about the keyword being misnamed. ;-)

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'backends/packaging-apt-dpkg.py'
2--- backends/packaging-apt-dpkg.py 2015-06-18 00:01:06 +0000
3+++ backends/packaging-apt-dpkg.py 2015-06-26 23:05:24 +0000
4@@ -781,7 +781,7 @@
5 if lp_url:
6 acquire_queue.append(apt.apt_pkg.AcquireFile(fetcher,
7 lp_url,
8- md5="sha1:%s" % sha1sum,
9+ hash="sha1:%s" % sha1sum,
10 destdir=archivedir))
11 lp_cache[pkg] = ver
12 else:
13@@ -855,7 +855,7 @@
14 if lp_url:
15 acquire_queue.append(apt.apt_pkg.AcquireFile(fetcher,
16 lp_url,
17- md5="sha1:%s" % sha1sum,
18+ hash="sha1:%s" % sha1sum,
19 destdir=archivedir))
20 lp_cache[dbg_pkg] = ver
21 pkg_found = True
22@@ -890,7 +890,7 @@
23 if lp_url:
24 acquire_queue.append(apt.apt_pkg.AcquireFile(fetcher,
25 lp_url,
26- md5="sha1:%s" % sha1sum,
27+ hash="sha1:%s" % sha1sum,
28 destdir=archivedir))
29 lp_cache[p] = ver
30 pkg_found = True
31@@ -919,7 +919,7 @@
32 if lp_url:
33 acquire_queue.append(apt.apt_pkg.AcquireFile(fetcher,
34 lp_url,
35- md5="sha1:%s" % sha1sum,
36+ hash="sha1:%s" % sha1sum,
37 destdir=archivedir))
38 lp_cache[dbgsym_pkg] = ver
39 pkg_found = True

Subscribers

People subscribed via source and target branches