diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2010-04-22 10:13:38 -0700 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2010-04-22 10:13:38 -0700 |
| commit | 87ab362234f761757d96ff1a758ab5c3bd85ed83 (patch) | |
| tree | 65ad13adcaca5489457a5ca5b184d6970ed70c13 /usr/src/tools/scripts/hg-active.py | |
| parent | 704030f4517ac42005a5e3a4cb2fe578c959bfe2 (diff) | |
| download | illumos-joyent-87ab362234f761757d96ff1a758ab5c3bd85ed83.tar.gz | |
6915602 onbld python modules should install into python version specific directories
Diffstat (limited to 'usr/src/tools/scripts/hg-active.py')
| -rw-r--r-- | usr/src/tools/scripts/hg-active.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/usr/src/tools/scripts/hg-active.py b/usr/src/tools/scripts/hg-active.py index c76e3696b9..05b67ffcc1 100644 --- a/usr/src/tools/scripts/hg-active.py +++ b/usr/src/tools/scripts/hg-active.py @@ -15,8 +15,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # ''' @@ -28,8 +27,12 @@ workspace in support of webrev's Mercurial support. # NB: This assumes the normal onbld directory structure # import sys, os -sys.path.insert(1, "%s/../lib/python" % os.path.dirname(__file__)) -sys.path.insert(1, "%s/.." % os.path.dirname(__file__)) + +sys.path.insert(1, os.path.join(os.path.dirname(__file__), "..", "lib", + "python%d.%d" % sys.version_info[:2])) + +# Allow running from the source tree, using the modules in the source tree +sys.path.insert(2, os.path.join(os.path.dirname(__file__), "..")) from onbld.Scm import Version |