mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-26 09:32:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

lib/oe/package_manager: fix handling of last package

Browse Source 
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: 7dba11373af742d4e4924e14e8fd386d53ffddbd)

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit a7b93c695b23d015607b179d98526b9b14c03d45)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jan Luebbe
2020-04-01 16:58:02 +02:00
committed by Richard Purdie
parent 5ab3ff5dcc
commit 54eec13b6e
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
meta/lib/oe/package_manager.py
View File

@@ -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):