diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-02 23:51:02 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-25 15:01:21 +0100 |
| commit | 59fe0384335ec615fa190affd758eb8c4446bfdc (patch) | |
| tree | f70dd023c4ab0376749b491ee08abd59b837761b | |
| parent | 597d0da6b4d64767f2bf6f40c49f4c4bd701f193 (diff) | |
| download | poky-59fe0384335ec615fa190affd758eb8c4446bfdc.tar.gz poky-59fe0384335ec615fa190affd758eb8c4446bfdc.tar.bz2 poky-59fe0384335ec615fa190affd758eb8c4446bfdc.zip | |
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: 639598aa855df523e3dd1f8df1b0eacfa7fb13d6)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | scripts/lib/resulttool/store.py | 21 |
1 files changed, 12 insertions, 9 deletions
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 = {} |