mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
lib/oe/package_manager: fix handling of last package
In commit 7d214b34e11dc57316ed5c1c7747c4601286f6d2, only the code in the for loop was modified to store the pkgarch value. The code used if there was no empty line at the end was not modified. Instead of fixing the duplicated code, remove it and just make sure that a final empty line is processed. (From OE-Core rev: a7b93c695b23d015607b179d98526b9b14c03d45) Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
440be55987
commit
e1aabb2cae
@@ -41,7 +41,7 @@ def opkg_query(cmd_output):
|
||||
filename = ""
|
||||
dep = []
|
||||
pkgarch = ""
|
||||
for line in cmd_output.splitlines():
|
||||
for line in cmd_output.splitlines()+['']:
|
||||
line = line.rstrip()
|
||||
if ':' in line:
|
||||
if line.startswith("Package: "):
|
||||
@@ -80,12 +80,6 @@ def opkg_query(cmd_output):
|
||||
dep = []
|
||||
pkgarch = ""
|
||||
|
||||
if pkg:
|
||||
if not filename:
|
||||
filename = "%s_%s_%s.ipk" % (pkg, ver, arch)
|
||||
output[pkg] = {"arch":arch, "ver":ver,
|
||||
"filename":filename, "deps": dep }
|
||||
|
||||
return output
|
||||
|
||||
def failed_postinsts_abort(pkgs, log_path):
|
||||
|
||||
Reference in New Issue
Block a user