summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-03-06 19:45:34 -0700
committerSimon Glass <sjg@chromium.org>2016-03-14 15:34:50 -0600
commit2bdeade0eac66e7b12db847ffbbcbe2e63a17fd4 (patch)
tree819d472ee13ed14f3fb4a2b51649a3050caa74de /tools
parent9ad96982e8c8c89cf75d4ebfc3e7e8afd3fe3364 (diff)
downloadtalos-obmc-uboot-2bdeade0eac66e7b12db847ffbbcbe2e63a17fd4.tar.gz
talos-obmc-uboot-2bdeade0eac66e7b12db847ffbbcbe2e63a17fd4.zip
buildman: patman: Fix -H when installed as a symlink
It is convenient to install symlinks to buildman and patman in the search patch, such as /usr/local/bin. But when this is done, the -H option fails to work because it looks in the directory containing the symlink instead of its target. Fix this. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/buildman/control.py3
-rwxr-xr-xtools/patman/patman.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/buildman/control.py b/tools/buildman/control.py
index 8b3cd30c00..c2c54bf0e8 100644
--- a/tools/buildman/control.py
+++ b/tools/buildman/control.py
@@ -101,7 +101,8 @@ def DoBuildman(options, args, toolchains=None, make_func=None, boards=None,
pager = os.getenv('PAGER')
if not pager:
pager = 'more'
- fname = os.path.join(os.path.dirname(sys.argv[0]), 'README')
+ fname = os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])),
+ 'README')
command.Run(pager, fname)
return 0
diff --git a/tools/patman/patman.py b/tools/patman/patman.py
index d05c5ff8e1..fe50eb4d5c 100755
--- a/tools/patman/patman.py
+++ b/tools/patman/patman.py
@@ -117,7 +117,8 @@ elif options.full_help:
pager = os.getenv('PAGER')
if not pager:
pager = 'more'
- fname = os.path.join(os.path.dirname(sys.argv[0]), 'README')
+ fname = os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])),
+ 'README')
command.Run(pager, fname)
# Process commits, produce patches files, check them, email them
OpenPOWER on IntegriCloud