[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1051/8267] oeqa/targetbuild: fix folder name estimate logic

[Emmanuele Bassi <ebassi src gnome org>]

commit 0aa028f5a993322484e2a874efc3a40ee8e5078a
Author: Ross Burton <ross burton intel com>
Date:   Mon Jun 20 17:32:31 2016 +0100

    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>

 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 d538f6b..6177a12 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):