|
|
@ -922,6 +922,8 @@ class ArchiveDistributive(Distributive):
|
|
|
|
return "gzip"
|
|
|
|
return "gzip"
|
|
|
|
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"):
|
|
|
|
|
|
|
|
return "7z"
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
return None
|
|
|
|
return None
|
|
|
|
|
|
|
|
|
|
|
@ -946,7 +948,8 @@ class ArchiveDistributive(Distributive):
|
|
|
|
res,mes = self.runOsCommand("tar xf %s -C %s/"%
|
|
|
|
res,mes = self.runOsCommand("tar xf %s -C %s/"%
|
|
|
|
(archfile,directory))
|
|
|
|
(archfile,directory))
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
raise DistributiveError(_("Unknown archive type by '%s'")%file)
|
|
|
|
raise DistributiveError(_("Unknown archive type by '%s'")%
|
|
|
|
|
|
|
|
archfile)
|
|
|
|
if res != 0:
|
|
|
|
if res != 0:
|
|
|
|
raise DistributiveError(_("Error during unpacking\n%s")%mes)
|
|
|
|
raise DistributiveError(_("Error during unpacking\n%s")%mes)
|
|
|
|
|
|
|
|
|
|
|
|