buildhistory-diff: use BUILDDIR to know where buildhistory is

Instead of assuming that the buildhistory is stored in ./buildhistory
unless told otherwise, use the environment variable BUILDDIR if present
(which is set by oe-init-build-env) to locate the buildhistory
directory.

(From OE-Core rev: 18ca377df98e53b84ae8ec9ba561392c776c10df)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton 2020-09-15 13:55:48 +01:00 committed by Richard Purdie
parent d393196485
commit 4064756e20

View File

@ -28,10 +28,12 @@ def get_args_parser():
%(prog)s [options] [from-revision [to-revision]] %(prog)s [options] [from-revision [to-revision]]
(if not specified, from-revision defaults to build-minus-1, and to-revision defaults to HEAD)""") (if not specified, from-revision defaults to build-minus-1, and to-revision defaults to HEAD)""")
default_dir = os.path.join(os.environ.get('BUILDDIR', '.'), 'buildhistory')
parser.add_argument('-p', '--buildhistory-dir', parser.add_argument('-p', '--buildhistory-dir',
action='store', action='store',
dest='buildhistory_dir', dest='buildhistory_dir',
default='buildhistory/', default=default_dir,
help="Specify path to buildhistory directory (defaults to buildhistory/ under cwd)") help="Specify path to buildhistory directory (defaults to buildhistory/ under cwd)")
parser.add_argument('-v', '--report-version', parser.add_argument('-v', '--report-version',
action='store_true', action='store_true',
@ -80,11 +82,6 @@ def main():
parser.print_help() parser.print_help()
sys.exit(1) sys.exit(1)
if not os.path.exists(args.buildhistory_dir):
if args.buildhistory_dir == 'buildhistory/':
cwd = os.getcwd()
if os.path.basename(cwd) == 'buildhistory':
args.buildhistory_dir = cwd
if not os.path.exists(args.buildhistory_dir): if not os.path.exists(args.buildhistory_dir):
sys.stderr.write('Buildhistory directory "%s" does not exist\n\n' % args.buildhistory_dir) sys.stderr.write('Buildhistory directory "%s" does not exist\n\n' % args.buildhistory_dir)