# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 2019-08-20 22:05:07
# Node ID 197e7326b8b86c97c0298cfa14e0dcb4a2da5e41
# Parent  2c4f656c8e9f61afd8590d6daf59d5593eeaa29c

contrib: simplify the genosxversion.py command to find the hg libraries

I forget what problem I ran into while trying to teach the makefile to use a
non-system python.  (It might have ben missing hg-evolve and/or keyring, but
`check_output()` was raising an error.)  This still isn't great because it will
return non zero for something like the username not being set, even though we
aren't asking for it.  But I suppose it's still useful to simplify.

Differential Revision: https://phab.mercurial-scm.org/D6753

diff --git a/contrib/genosxversion.py b/contrib/genosxversion.py
--- a/contrib/genosxversion.py
+++ b/contrib/genosxversion.py
@@ -2,14 +2,13 @@
 from __future__ import absolute_import, print_function
 
 import argparse
-import json
 import os
 import subprocess
 import sys
 
 # Always load hg libraries from the hg we can find on $PATH.
-hglib = json.loads(subprocess.check_output(
-    ['hg', 'debuginstall', '-Tjson']))[0]['hgmodules']
+hglib = subprocess.check_output(
+    ['hg', 'debuginstall', '-T', '{hgmodules}'])
 sys.path.insert(0, os.path.dirname(hglib))
 
 from mercurial import util