Mercurial > hg
changeset 16436:e98460f6089d
scmutil: fix systemrcpath regression introduced in f5dd179bfa4a
Changeset f5dd179bfa4a introduced a 'root' path component to look for
hgrc files, which is used both as an absolute path and a path relative
to the <install-root>.
The latter one was broken since 'root' was set to an absolute location
and the subsequent os.path.join discarded the <install-root> path prefix.
| author | Wolfgang Treutterer <Wolfgang.Treutterer@ipp.mpg.de> |
|---|---|
| date | Fri, 13 Apr 2012 10:08:08 +0200 |
| parents | df347129305d |
| children | d126a0d16856 |
| files | mercurial/scmutil.py |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/scmutil.py Fri Apr 13 10:14:59 2012 +0200 +++ b/mercurial/scmutil.py Fri Apr 13 10:08:08 2012 +0200 @@ -437,14 +437,14 @@ def systemrcpath(): path = [] if sys.platform == 'plan9': - root = '/lib/mercurial' + root = 'lib/mercurial' else: - root = '/etc/mercurial' + root = 'etc/mercurial' # old mod_python does not set sys.argv if len(getattr(sys, 'argv', [])) > 0: p = os.path.dirname(os.path.dirname(sys.argv[0])) path.extend(rcfiles(os.path.join(p, root))) - path.extend(rcfiles(root)) + path.extend(rcfiles('/' + root)) return path def userrcpath():