This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7451

debuginstall: gracefully handle missing __file__ attributes
ClosedPublic

Authored by mharbison72 on Nov 17 2019, 1:06 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG1fb19665c166: debuginstall: gracefully handle missing __file__ attributes
Summary

This was crashing PyOxidizer. While here, point "Python lib" and "installed
modules" to the oxidized binary when read from memory instead of pretending
their location is unknown.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

mharbison72 created this revision.Nov 17 2019, 1:06 AM
indygreg accepted this revision.Nov 17 2019, 6:26 PM
indygreg added a subscriber: indygreg.

Pointing to the executable when running with PyOxidizer seems like a reasonable approach to me!

This revision is now accepted and ready to land.Nov 17 2019, 6:26 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/debugcommands.py (16 lines)

Diff 18202

mercurial/debugcommands.py

fm.condwrite( fm.condwrite(
err, err,
b'encodingerror', b'encodingerror',
_(b" %s\n (check that your locale is properly set)\n"), _(b" %s\n (check that your locale is properly set)\n"),
err, err,
) )
# Python # Python
pythonlib = None
if util.safehasattr(os, '__file__'):
pythonlib = os.path.dirname(pycompat.fsencode(os.__file__))
elif getattr(sys, 'oxidized', False):
pythonlib = pycompat.sysexecutable
fm.write( fm.write(
b'pythonexe', b'pythonexe',
_(b"checking Python executable (%s)\n"), _(b"checking Python executable (%s)\n"),
pycompat.sysexecutable or _(b"unknown"), pycompat.sysexecutable or _(b"unknown"),
) )
fm.write( fm.write(
b'pythonver', b'pythonver',
_(b"checking Python version (%s)\n"), _(b"checking Python version (%s)\n"),
(b"%d.%d.%d" % sys.version_info[:3]), (b"%d.%d.%d" % sys.version_info[:3]),
) )
fm.write( fm.write(
b'pythonlib', b'pythonlib',
_(b"checking Python lib (%s)...\n"), _(b"checking Python lib (%s)...\n"),
os.path.dirname(pycompat.fsencode(os.__file__)), pythonlib or _(b"unknown"),
) )
security = set(sslutil.supportedprotocols) security = set(sslutil.supportedprotocols)
if sslutil.hassni: if sslutil.hassni:
security.add(b'sni') security.add(b'sni')
fm.write( fm.write(
b'pythonsecurity', b'pythonsecurity',
) )
fm.write( fm.write(
b'hgverextra', b'hgverextra',
_(b"checking Mercurial custom build (%s)\n"), _(b"checking Mercurial custom build (%s)\n"),
b'+'.join(hgver.split(b'+')[1:]), b'+'.join(hgver.split(b'+')[1:]),
) )
# compiled modules # compiled modules
hgmodules = None
if util.safehasattr(util, '__file__'):
hgmodules = os.path.dirname(pycompat.fsencode(util.__file__))
elif getattr(sys, 'oxidized', False):
hgmodules = pycompat.sysexecutable
fm.write( fm.write(
b'hgmodulepolicy', _(b"checking module policy (%s)\n"), policy.policy b'hgmodulepolicy', _(b"checking module policy (%s)\n"), policy.policy
) )
fm.write( fm.write(
b'hgmodules', b'hgmodules',
_(b"checking installed modules (%s)...\n"), _(b"checking installed modules (%s)...\n"),
os.path.dirname(pycompat.fsencode(__file__)), hgmodules or _(b"unknown"),
) )
rustandc = policy.policy in (b'rust+c', b'rust+c-allow') rustandc = policy.policy in (b'rust+c', b'rust+c-allow')
rustext = rustandc # for now, that's the only case rustext = rustandc # for now, that's the only case
cext = policy.policy in (b'c', b'allow') or rustandc cext = policy.policy in (b'c', b'allow') or rustandc
nopure = cext or rustext nopure = cext or rustext
if nopure: if nopure:
err = None err = None