Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hghave: fix dpkg --version check to work on recent dpkg versions
authorKyle Lippincott <spectral@google.com>
Sun, 01 Oct 2017 03:48:28 -0700
changeset 34394 dbf83230e8be
parent 34393 fffd3369aa83
child 34395 41401f502c83
hghave: fix dpkg --version check to work on recent dpkg versions Differential Revision: https://phab.mercurial-scm.org/D869
tests/hghave.py file | annotate | diff | comparison | revisions 
--- 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',
mercurial