public inbox for openembedded-core@lists.openembedded.org
 help / color / mirror / Atom feed
From: "Jan Luebbe" <jlu@pengutronix.de>
To: openembedded-core@lists.openembedded.org
Cc: Jan Luebbe <jlu@pengutronix.de>
Subject: [OE-core][PATCH 2/5] lib/oe/package_manager: fix handling of last package
Date: Wed,  1 Apr 2020 16:58:02 +0200	[thread overview]
Message-ID: <20200401145805.6936-3-jlu@pengutronix.de> (raw)
In-Reply-To: <20200401145805.6936-1-jlu@pengutronix.de>

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>
---
 meta/lib/oe/package_manager.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index dfe4197ce1fb..072372892732 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):
-- 
2.26.0.rc2


  parent reply	other threads:[~2020-04-01 14:58 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-01 14:58 [OE-core][PATCH 0/5] fix populate_sdk for package_deb Jan Luebbe
2020-04-01 14:58 ` [OE-core][PATCH 1/5] lib/oe/package_manager: make sure to not remove packages in apt install Jan Luebbe
2020-04-01 14:58 ` Jan Luebbe [this message]
2020-04-01 14:58 ` [OE-core][PATCH 3/5] lib/oe/package_manager: collect provided package names when using debs Jan Luebbe
2020-04-01 14:58 ` [OE-core][PATCH 4/5] lib/oe/package_manager: avoid installing provided packages via apt Jan Luebbe
2020-04-01 14:58 ` [OE-core][PATCH 5/5] lib/oe/package_manager: don't try to rm /var/lib/opkg Jan Luebbe
2020-04-03 16:05   ` Peter Kjellerstedt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200401145805.6936-3-jlu@pengutronix.de \
    --to=jlu@pengutronix.de \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox