|
|
@ -921,8 +921,10 @@ class ArchiveDistributive(Distributive):
|
|
|
|
elif "7-zip archive data" in mes:
|
|
|
|
elif "7-zip archive data" in mes:
|
|
|
|
return "7z"
|
|
|
|
return "7z"
|
|
|
|
elif file and file.endswith(".tar.lzma"):
|
|
|
|
elif file and file.endswith(".tar.lzma"):
|
|
|
|
|
|
|
|
if path.exists('/usr/bin/7za'):
|
|
|
|
return "7z"
|
|
|
|
return "7z"
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
|
|
|
|
return "lzma"
|
|
|
|
return None
|
|
|
|
return None
|
|
|
|
|
|
|
|
|
|
|
|
def _unpackArchive(self,archfile,directory):
|
|
|
|
def _unpackArchive(self,archfile,directory):
|
|
|
@ -939,6 +941,9 @@ class ArchiveDistributive(Distributive):
|
|
|
|
if archiveType == "7z":
|
|
|
|
if archiveType == "7z":
|
|
|
|
res,mes = self.runOsCommand("7za x -so %s | tar xf - -C %s/"%
|
|
|
|
res,mes = self.runOsCommand("7za x -so %s | tar xf - -C %s/"%
|
|
|
|
(archfile,directory))
|
|
|
|
(archfile,directory))
|
|
|
|
|
|
|
|
elif archiveType == "lzma":
|
|
|
|
|
|
|
|
res,mes = self.runOsCommand("lzma -dc %s | tar xf - -C %s/"%
|
|
|
|
|
|
|
|
(archfile,directory))
|
|
|
|
elif archiveType == "bzip2":
|
|
|
|
elif archiveType == "bzip2":
|
|
|
|
res,mes = self.runOsCommand("tar xjf %s -C %s/"%
|
|
|
|
res,mes = self.runOsCommand("tar xjf %s -C %s/"%
|
|
|
|
(archfile,directory))
|
|
|
|
(archfile,directory))
|
|
|
|