apport-hackers team mailing list archive

[Brian Murray <brian@xxxxxxxxxx>]

Brian Murray has proposed merging lp:~brian-murray/apport/python-apt-hash into lp:apport.

Requested reviews:
  Apport upstream developers (apport-hackers)

For more details, see:
https://code.launchpad.net/~brian-murray/apport/python-apt-hash/+merge/263176

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. ;-)
-- 
Your team Apport upstream developers is requested to review the proposed merge of lp:~brian-murray/apport/python-apt-hash into lp:apport.

=== 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 @@
                 if lp_url:
                     acquire_queue.append(apt.apt_pkg.AcquireFile(fetcher,
                                                                  lp_url,
-                                                                 md5="sha1:%s" % sha1sum,
+                                                                 hash="sha1:%s" % sha1sum,
                                                                  destdir=archivedir))
                     lp_cache[pkg] = ver
                 else:
@@ -855,7 +855,7 @@
                             if lp_url:
                                 acquire_queue.append(apt.apt_pkg.AcquireFile(fetcher,
                                                                              lp_url,
-                                                                             md5="sha1:%s" % sha1sum,
+                                                                             hash="sha1:%s" % sha1sum,
                                                                              destdir=archivedir))
                                 lp_cache[dbg_pkg] = ver
                                 pkg_found = True
@@ -890,7 +890,7 @@
                                     if lp_url:
                                         acquire_queue.append(apt.apt_pkg.AcquireFile(fetcher,
                                                                                      lp_url,
-                                                                                     md5="sha1:%s" % sha1sum,
+                                                                                     hash="sha1:%s" % sha1sum,
                                                                                      destdir=archivedir))
                                         lp_cache[p] = ver
                                         pkg_found = True
@@ -919,7 +919,7 @@
                                     if lp_url:
                                         acquire_queue.append(apt.apt_pkg.AcquireFile(fetcher,
                                                                                      lp_url,
-                                                                                     md5="sha1:%s" % sha1sum,
+                                                                                     hash="sha1:%s" % sha1sum,
                                                                                      destdir=archivedir))
                                         lp_cache[dbgsym_pkg] = ver
                                         pkg_found = True