# HG changeset patch # User Augie Fackler # Date 2020-09-01 14:33:10 # Node ID 148d177a4f2dc4b75aab772a90583718253d3e7c # Parent fc8299319ffe3f462fbaeefae3ba740b913c20eb genosxversion: don't give up if we can't find a path to hg libraries This doesn't work if you have a PyOxidized hg on $PATH, but everything is fine if you just ignore that problem. Differential Revision: https://phab.mercurial-scm.org/D8975 diff --git a/contrib/genosxversion.py b/contrib/genosxversion.py --- a/contrib/genosxversion.py +++ b/contrib/genosxversion.py @@ -6,9 +6,14 @@ import os import subprocess import sys -# Always load hg libraries from the hg we can find on $PATH. -hglib = subprocess.check_output(['hg', 'debuginstall', '-T', '{hgmodules}']) -sys.path.insert(0, os.path.dirname(hglib)) +try: + # Always load hg libraries from the hg we can find on $PATH. + hglib = subprocess.check_output(['hg', 'debuginstall', '-T', '{hgmodules}']) + sys.path.insert(0, os.path.dirname(hglib)) +except subprocess.CalledProcessError: + # We're probably running with a PyOxidized Mercurial, so just + # proceed and hope it works out okay. + pass from mercurial import util