From ac99135b009a1066486ed2afb2f298d0a5a3a854 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 20 Jun 2016 17:32:31 +0100 Subject: 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 --- meta/lib/oeqa/utils/targetbuild.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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): -- cgit 1.2.3-korg