From: Ross Burton <ross.burton@intel.com>
Date: Mon, 20 Jun 2016 16:32:31 +0000 (+0100)
Subject: oeqa/targetbuild: fix folder name estimate logic
X-Git-Tag: uninative-1.3~557
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=ac99135b009a1066486ed2afb2f298d0a5a3a854;p=openembedded-core.git

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>
---

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):