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
=== modified file 'backends/packaging-apt-dpkg.py'
--- backends/packaging-apt-dpkg.py 2015-06-18 00:01:06 +0000
+++ backends/packaging-apt-dpkg.py 2015-06-26 23:05:24 +0000
@@ -781,7 +781,7 @@
781 if lp_url:781 if lp_url:
782 acquire_queue.append(apt.apt_pkg.AcquireFile(fetcher,782 acquire_queue.append(apt.apt_pkg.AcquireFile(fetcher,
783 lp_url,783 lp_url,
784 md5="sha1:%s" % sha1sum,784 hash="sha1:%s" % sha1sum,
785 destdir=archivedir))785 destdir=archivedir))
786 lp_cache[pkg] = ver786 lp_cache[pkg] = ver
787 else:787 else:
@@ -855,7 +855,7 @@
855 if lp_url:855 if lp_url:
856 acquire_queue.append(apt.apt_pkg.AcquireFile(fetcher,856 acquire_queue.append(apt.apt_pkg.AcquireFile(fetcher,
857 lp_url,857 lp_url,
858 md5="sha1:%s" % sha1sum,858 hash="sha1:%s" % sha1sum,
859 destdir=archivedir))859 destdir=archivedir))
860 lp_cache[dbg_pkg] = ver860 lp_cache[dbg_pkg] = ver
861 pkg_found = True861 pkg_found = True
@@ -890,7 +890,7 @@
890 if lp_url:890 if lp_url:
891 acquire_queue.append(apt.apt_pkg.AcquireFile(fetcher,891 acquire_queue.append(apt.apt_pkg.AcquireFile(fetcher,
892 lp_url,892 lp_url,
893 md5="sha1:%s" % sha1sum,893 hash="sha1:%s" % sha1sum,
894 destdir=archivedir))894 destdir=archivedir))
895 lp_cache[p] = ver895 lp_cache[p] = ver
896 pkg_found = True896 pkg_found = True
@@ -919,7 +919,7 @@
919 if lp_url:919 if lp_url:
920 acquire_queue.append(apt.apt_pkg.AcquireFile(fetcher,920 acquire_queue.append(apt.apt_pkg.AcquireFile(fetcher,
921 lp_url,921 lp_url,
922 md5="sha1:%s" % sha1sum,922 hash="sha1:%s" % sha1sum,
923 destdir=archivedir))923 destdir=archivedir))
924 lp_cache[dbgsym_pkg] = ver924 lp_cache[dbgsym_pkg] = ver
925 pkg_found = True925 pkg_found = True

Subscribers

People subscribed via source and target branches