diff options
| author |   Ross Burton <ross.burton@intel.com> | 2016-06-20 17:32:31 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-23 14:23:29 +0100 |
| commit | ac99135b009a1066486ed2afb2f298d0a5a3a854 (patch) | |
| tree | b6f62b565c93576933a0f752555a30709850b934 /meta | |
| parent | ddcf128e76ed0678ce42416531f4ecb309c57439 (diff) | |
| download | openembedded-core-contrib-ac99135b009a1066486ed2afb2f298d0a5a3a854.tar.gz | |
oeqa/targetbuild: fix folder name estimate logic
The re.sub() used to transform a tarball into a best guess folder name wasn't
right, as there isn't enough escaping and tar.xz was missing.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/lib/oeqa/utils/targetbuild.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/lib/oeqa/utils/targetbuild.py b/meta/lib/oeqa/utils/targetbuild.py index d538f6b65f..6177a12eb9 100644 --- a/meta/lib/oeqa/utils/targetbuild.py +++ b/meta/lib/oeqa/utils/targetbuild.py @@ -17,9 +17,10 @@ class BuildProject(metaclass=ABCMeta): self.uri = uri self.archive = os.path.basename(uri) self.localarchive = os.path.join(tmpdir,self.archive) - self.fname = re.sub(r'.tar.bz2|tar.gz$', '', self.archive) if foldername: self.fname = foldername + else: + self.fname = re.sub(r'\.tar\.bz2$|\.tar\.gz$|\.tar\.xz$', '', self.archive) # Download self.archive to self.localarchive def _download_archive(self): |