diff -Nru sosreport-3.5/debian/changelog sosreport-3.5/debian/changelog --- sosreport-3.5/debian/changelog 2017-11-16 06:53:34.000000000 -0500 +++ sosreport-3.5/debian/changelog 2017-12-07 08:33:33.000000000 -0500 @@ -1,3 +1,11 @@ +sosreport (3.5-1ubuntu1) bionic; urgency=medium + + * d/p/0002-reset-to-expected-variable-order-for-packagemanager.patch: + Fixing severe regression where many "packages = " lines are no + longer working in Debian/Ubuntu. Preventing automatic package detection. + + -- Eric Desrochers Tue, 05 Dec 2017 17:04:34 +0000 + sosreport (3.5-1) unstable; urgency=medium * testNew upstream release v3.5 diff -Nru sosreport-3.5/debian/patches/0002-reset-to-expected-variable-order-for-packagemanager.patch sosreport-3.5/debian/patches/0002-reset-to-expected-variable-order-for-packagemanager.patch --- sosreport-3.5/debian/patches/0002-reset-to-expected-variable-order-for-packagemanager.patch 1969-12-31 19:00:00.000000000 -0500 +++ sosreport-3.5/debian/patches/0002-reset-to-expected-variable-order-for-packagemanager.patch 2017-12-05 12:14:24.000000000 -0500 @@ -0,0 +1,24 @@ +Description: Reset to expected variable order for packagemanager. + Commit 82e4ee2 changed the order of variables in packagemanager + to what none of the policies expected. This sets it back so + query is always first. Red Hat policy is the only one that + uses more than one variable for it. +Author: Bryan Quigley +Origin: upstream, https://github.com/sosreport/sos/pull/1156/commits/a7f4f83590bf9338ade0d79d7c7af0f2c21892b0 +Bug: https://github.com/sosreport/sos/issues/1155 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1734983 +Index: sosreport-3.5/sos/policies/__init__.py +=================================================================== +--- sosreport-3.5.orig/sos/policies/__init__.py ++++ sosreport-3.5/sos/policies/__init__.py +@@ -59,8 +59,8 @@ class PackageManager(object): + verify_filter = None + chroot = None + +- def __init__(self, chroot=None, query_command=None, +- verify_command=None, verify_filter=None): ++ def __init__(self, query_command=None, verify_command=None, ++ verify_filter=None, chroot=None,): + self.packages = {} + + self.query_command = query_command if query_command else None diff -Nru sosreport-3.5/debian/patches/series sosreport-3.5/debian/patches/series --- sosreport-3.5/debian/patches/series 2017-11-16 06:53:34.000000000 -0500 +++ sosreport-3.5/debian/patches/series 2017-12-05 11:59:59.000000000 -0500 @@ -1 +1,2 @@ 0001-skip-py2-only-tests.patch +0002-reset-to-expected-variable-order-for-packagemanager.patch