From 803d404bdf69cfcd8ab418a0e3e8709ed0f66911 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 2 Apr 2019 23:51:02 +0100 Subject: resulttool: Allow store to work on single files Store operations using a single file as a source weren't working as the os.walk command didn't like being given a single file. Fix the store operation to work for single files. (From OE-Core rev: eb5bbe613d8c7cbcd8b74d8ac0073c2217970410) Signed-off-by: Richard Purdie --- scripts/lib/resulttool/store.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'scripts') diff --git a/scripts/lib/resulttool/store.py b/scripts/lib/resulttool/store.py index 5e33716c3d..3a81933242 100644 --- a/scripts/lib/resulttool/store.py +++ b/scripts/lib/resulttool/store.py @@ -29,15 +29,18 @@ def store(args, logger): try: results = {} logger.info('Reading files from %s' % args.source) - for root, dirs, files in os.walk(args.source): - for name in files: - f = os.path.join(root, name) - if name == "testresults.json": - resultutils.append_resultsdata(results, f) - elif args.all: - dst = f.replace(args.source, tempdir + "/") - os.makedirs(os.path.dirname(dst), exist_ok=True) - shutil.copyfile(f, dst) + if os.path.isfile(args.source): + resultutils.append_resultsdata(results, args.source) + else: + for root, dirs, files in os.walk(args.source): + for name in files: + f = os.path.join(root, name) + if name == "testresults.json": + resultutils.append_resultsdata(results, f) + elif args.all: + dst = f.replace(args.source, tempdir + "/") + os.makedirs(os.path.dirname(dst), exist_ok=True) + shutil.copyfile(f, dst) revisions = {} -- cgit v1.2.3-54-g00ecf