]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
fetcher: use os.path.splitext() instead of string.split()
authorRoss Burton <ross.burton@intel.com>
Fri, 16 Jan 2015 17:53:23 +0000 (17:53 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 21 Jan 2015 14:20:30 +0000 (14:20 +0000)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
lib/bb/fetch2/__init__.py

index f97eaf43998f2565fba4af2bb4c17fee8425d7f6..599ea8c822f05695c585db988d8981a7ef7034b1 100644 (file)
@@ -1201,9 +1201,9 @@ class FetchMethod(object):
             bb.fatal("Invalid value for 'unpack' parameter for %s: %s" %
                      (file, urldata.parm.get('unpack')))
 
-        dots = file.split(".")
-        if dots[-1] in ['gz', 'bz2', 'Z', 'xz', 'lz']:
-            efile = os.path.join(rootdir, os.path.basename('.'.join(dots[0:-1])))
+        base, ext = os.path.splitext(file)
+        if ext in ['.gz', '.bz2', '.Z', '.xz', '.lz']:
+            efile = os.path.join(rootdir, os.path.basename(base))
         else:
             efile = file
         cmd = None