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:26:16 +0100 |
commit | 0aa028f5a993322484e2a874efc3a40ee8e5078a (patch) | |
tree | 756a5f692e36331da9b23647e42d26e81257b856 /meta/lib | |
parent | c844230ba9649c4a82e722cc1cc85d8258a57257 (diff) | |
download | poky-0aa028f5a993322484e2a874efc3a40ee8e5078a.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.
(From OE-Core rev: ac99135b009a1066486ed2afb2f298d0a5a3a854)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-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): | |||
17 | self.uri = uri | 17 | self.uri = uri |
18 | self.archive = os.path.basename(uri) | 18 | self.archive = os.path.basename(uri) |
19 | self.localarchive = os.path.join(tmpdir,self.archive) | 19 | self.localarchive = os.path.join(tmpdir,self.archive) |
20 | self.fname = re.sub(r'.tar.bz2|tar.gz$', '', self.archive) | ||
21 | if foldername: | 20 | if foldername: |
22 | self.fname = foldername | 21 | self.fname = foldername |
22 | else: | ||
23 | self.fname = re.sub(r'\.tar\.bz2$|\.tar\.gz$|\.tar\.xz$', '', self.archive) | ||
23 | 24 | ||
24 | # Download self.archive to self.localarchive | 25 | # Download self.archive to self.localarchive |
25 | def _download_archive(self): | 26 | def _download_archive(self): |