diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2017-10-31 14:24:42 +1300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-11 12:14:27 +0000 |
| commit | 541b7e2ce043524d2310fd642dbce4daa70f8457 (patch) | |
| tree | 9588f0f107f4f02452a73b0db95a130276b973ec /scripts | |
| parent | 46a3662d4e441b8c6148b00096faeb93ab5447a9 (diff) | |
| download | openembedded-core-contrib-541b7e2ce043524d2310fd642dbce4daa70f8457.tar.gz | |
devtool: show a better error message if meta-files aren't found
If the files that the devtool-source class is supposed to create in the
source tree aren't found in the temporary directory then we know that
the class hasn't worked properly - say that explicitly.
(From OE-Core rev: 4621152509c037532b133e5e6d5b73bda7ddb602)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/devtool/standard.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 5ac678b3b18..1e7d707d681 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -544,11 +544,14 @@ def _extract_source(srctree, keep_temp, devbranch, sync, config, basepath, works if not res: raise DevtoolError('Extracting source for %s failed' % pn) - with open(os.path.join(tempdir, 'initial_rev'), 'r') as f: - initial_rev = f.read() + try: + with open(os.path.join(tempdir, 'initial_rev'), 'r') as f: + initial_rev = f.read() - with open(os.path.join(tempdir, 'srcsubdir'), 'r') as f: - srcsubdir = f.read() + with open(os.path.join(tempdir, 'srcsubdir'), 'r') as f: + srcsubdir = f.read() + except FileNotFoundError as e: + raise DevtoolError('Something went wrong with source extraction - the devtool-source class was not active or did not function correctly:\n%s' % str(e)) srcsubdir_rel = os.path.relpath(srcsubdir, os.path.join(tempdir, 'workdir')) tempdir_localdir = os.path.join(tempdir, 'oe-local-files') |