This revision was automatically updated to reflect the committed changes. Closed by commit rHGdbf83230e8be: hghave: fix dpkg --version check to work on recent dpkg versions (authored by spectral, committed by ).
REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D869?vs=2239&id=2241 REVISION DETAIL https://phab.mercurial-scm.org/D869 AFFECTED FILES tests/hghave.py CHANGE DETAILS diff --git a/tests/hghave.py b/tests/hghave.py --- a/tests/hghave.py +++ b/tests/hghave.py @@ -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', To: spectral, #hg-reviewers, durin42 Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel