Fix OTAManager tar invocations (#4150)

* Bump base

* Fix tar flag ordering in OTAManager

So that no-recursion actually gets honored, preventing us from creating
extra-large archives with unrelated content...
(Tar started being pickier about flag ordering in a recent version bump).

Fix #4147
Closes #4148 (by superceding it)
pull/4140/head
NiLuJe 6 years ago committed by GitHub
parent 637abfdf84
commit d222fe25b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1 +1 @@
Subproject commit ae3e5a7f658c414bb2368b3e5fb435d05805081e
Subproject commit 69bae2122eb051ddbd235c5053e54a894e9d96d9

@ -187,17 +187,17 @@ function OTAManager:_buildLocalPackage()
end
if Device:isAndroid() then
return os.execute(string.format(
"./tar cf %s -T %s --no-recursion",
"./tar --no-recursion -cf %s -T %s",
self.installed_package, self.package_indexfile))
else
-- With visual feedback if supported...
if lfs.attributes("./kotar_cpoint", "mode") == "file" then
return os.execute(string.format(
"./tar cf %s -C .. -T %s --no-recursion --checkpoint=200 --checkpoint-action=exec='./kotar_cpoint $TAR_CHECKPOINT create'",
"./tar --no-recursion -cf %s -C .. -T %s --checkpoint=200 --checkpoint-action=exec='./kotar_cpoint $TAR_CHECKPOINT create'",
self.installed_package, self.package_indexfile))
else
return os.execute(string.format(
"./tar cf %s -C .. -T %s --no-recursion",
"./tar --no-recursion -cf %s -C .. -T %s",
self.installed_package, self.package_indexfile))
end
end

Loading…
Cancel
Save