From: Simon Glass Date: Mon, 7 Mar 2016 02:45:34 +0000 (-0700) Subject: buildman: patman: Fix -H when installed as a symlink X-Git-Tag: v2016.05-rc1~420^2~3 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2bdeade0eac66e7b12db847ffbbcbe2e63a17fd4;p=u-boot 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 Reviewed-by: Joe Hershberger --- 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