diff options
| author |   Jan Luebbe <jlu@pengutronix.de> | 2020-04-01 16:58:02 +0200 |
|---|---|---|
| committer |   Anuj Mittal <anuj.mittal@intel.com> | 2020-04-06 15:17:05 +0800 |
| commit | 7dba11373af742d4e4924e14e8fd386d53ffddbd (patch) | |
| tree | b67e01d06e2a1828fc6ad94613a3cebc6dadd74e | |
| parent | 15790fa224f405652e8ccc93c01dee04a7259246 (diff) | |
| download | openembedded-core-contrib-7dba11373af742d4e4924e14e8fd386d53ffddbd.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.
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>
| -rw-r--r-- | meta/lib/oe/package_manager.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 61206daeaa..27b2f17f95 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -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): |