summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe
diff options
context:
space:
mode:
authorJan Luebbe <jlu@pengutronix.de>2020-04-01 16:58:02 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-04-02 15:24:58 +0100
commite1aabb2cae79b10ff552b60099d78de0031af698 (patch)
tree2cec70ac440330fa5eaa8a7d3c54c2114867b5c3 /meta/lib/oe
parent440be559875a8acbbfd4449c753524a210c31554 (diff)
downloadpoky-e1aabb2cae79b10ff552b60099d78de0031af698.tar.gz
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>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r--meta/lib/oe/package_manager.py8
1 files changed, 1 insertions, 7 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index dfe4197ce1..0723728927 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -41,7 +41,7 @@ def opkg_query(cmd_output):
41 filename = "" 41 filename = ""
42 dep = [] 42 dep = []
43 pkgarch = "" 43 pkgarch = ""
44 for line in cmd_output.splitlines(): 44 for line in cmd_output.splitlines()+['']:
45 line = line.rstrip() 45 line = line.rstrip()
46 if ':' in line: 46 if ':' in line:
47 if line.startswith("Package: "): 47 if line.startswith("Package: "):
@@ -80,12 +80,6 @@ def opkg_query(cmd_output):
80 dep = [] 80 dep = []
81 pkgarch = "" 81 pkgarch = ""
82 82
83 if pkg:
84 if not filename:
85 filename = "%s_%s_%s.ipk" % (pkg, ver, arch)
86 output[pkg] = {"arch":arch, "ver":ver,
87 "filename":filename, "deps": dep }
88
89 return output 83 return output
90 84
91def failed_postinsts_abort(pkgs, log_path): 85def failed_postinsts_abort(pkgs, log_path):