# HG changeset patch # User Kyle Lippincott # Date 1506854908 25200 # Node ID dbf83230e8bebc998a1f08a414d757bc32487d39 # Parent fffd3369aa83984fc6c8c53597b858e76c1d283b hghave: fix dpkg --version check to work on recent dpkg versions Differential Revision: https://phab.mercurial-scm.org/D869 diff -r fffd3369aa83 -r dbf83230e8be tests/hghave.py --- a/tests/hghave.py Sun Oct 01 11:29:20 2017 +0100 +++ b/tests/hghave.py Sun Oct 01 03:48:28 2017 -0700 @@ -573,8 +573,10 @@ @check("debhelper", "debian packaging tools") def has_debhelper(): + # Some versions of dpkg say `dpkg', some say 'dpkg' (` vs ' on the first + # quote), so just accept anything in that spot. dpkg = matchoutput('dpkg --version', - br"Debian `dpkg' package management program") + br"Debian .dpkg' package management program") dh = matchoutput('dh --help', br'dh is a part of debhelper.', ignorestatus=True) dh_py2 = matchoutput('dh_python2 --help',