From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexander Kanavin <alex@linutronix.de>
Subject: [PATCH 1/4] lib/oe/recipeutils: return a dict in get_recipe_upgrade_status() instead of a tuple
Date: Wed, 17 Jul 2024 20:22:13 +0200 [thread overview]
Message-ID: <20240717182216.1661015-1-alex.kanavin@gmail.com> (raw)
From: Alexander Kanavin <alex@linutronix.de>
Putting various things in a tuple is an anti-pattern of sorts, as the consumers
have to unpack it into local variables for readability, or access items directly
with indexes, which makes code pretty much unreadable.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
meta/lib/oe/recipeutils.py | 2 +-
meta/lib/oeqa/selftest/cases/distrodata.py | 4 ++--
scripts/lib/devtool/upgrade.py | 14 +++++++-------
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index 2d69a331132..f9d7dfe253a 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -1112,7 +1112,7 @@ def _get_recipe_upgrade_status(data):
maintainer = data.getVar('RECIPE_MAINTAINER')
no_upgrade_reason = data.getVar('RECIPE_NO_UPDATE_REASON')
- return (pn, status, cur_ver, next_ver, maintainer, revision, no_upgrade_reason)
+ return {'pn':pn, 'status':status, 'cur_ver':cur_ver, 'next_ver':next_ver, 'maintainer':maintainer, 'revision':revision, 'no_upgrade_reason':no_upgrade_reason}
def get_recipe_upgrade_status(recipes=None):
pkgs_list = []
diff --git a/meta/lib/oeqa/selftest/cases/distrodata.py b/meta/lib/oeqa/selftest/cases/distrodata.py
index ad952c004b5..b60913dbca4 100644
--- a/meta/lib/oeqa/selftest/cases/distrodata.py
+++ b/meta/lib/oeqa/selftest/cases/distrodata.py
@@ -22,8 +22,8 @@ class Distrodata(OESelftestTestCase):
pkgs = oe.recipeutils.get_recipe_upgrade_status()
- regressed_failures = [pkg[0] for pkg in pkgs if pkg[1] == 'UNKNOWN_BROKEN']
- regressed_successes = [pkg[0] for pkg in pkgs if pkg[1] == 'KNOWN_BROKEN']
+ regressed_failures = [pkg['pn'] for pkg in pkgs if pkg['status'] == 'UNKNOWN_BROKEN']
+ regressed_successes = [pkg['pn'] for pkg in pkgs if pkg['status'] == 'KNOWN_BROKEN']
msg = ""
if len(regressed_failures) > 0:
msg = msg + """
diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py
index 8e13833b51c..10b4f8b5ee5 100644
--- a/scripts/lib/devtool/upgrade.py
+++ b/scripts/lib/devtool/upgrade.py
@@ -659,13 +659,13 @@ def check_upgrade_status(args, config, basepath, workspace):
results = oe.recipeutils.get_recipe_upgrade_status(args.recipe)
for result in results:
# pn, update_status, current, latest, maintainer, latest_commit, no_update_reason
- if args.all or result[1] != 'MATCH':
- print("{:25} {:15} {:15} {} {} {}".format( result[0],
- result[2],
- result[1] if result[1] != 'UPDATE' else (result[3] if not result[3].endswith("new-commits-available") else "new commits"),
- result[4],
- result[5] if result[5] != 'N/A' else "",
- "cannot be updated due to: %s" %(result[6]) if result[6] else ""))
+ if args.all or result['status'] != 'MATCH':
+ print("{:25} {:15} {:15} {} {} {}".format( result['pn'],
+ result['cur_ver'],
+ result['status'] if result['status'] != 'UPDATE' else (result['next_ver'] if not result['next_ver'].endswith("new-commits-available") else "new commits"),
+ result['maintainer'],
+ result['revision'] if result['revision'] != 'N/A' else "",
+ "cannot be updated due to: %s" %(result['no_upgrade_reason']) if result['no_upgrade_reason'] else ""))
def register_commands(subparsers, context):
"""Register devtool subcommands from this plugin"""
--
2.39.2
next reply other threads:[~2024-07-17 18:22 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-17 18:22 Alexander Kanavin [this message]
2024-07-17 18:22 ` [PATCH 2/4] lib/recipeutils: add a function to determine recipes with shared include files Alexander Kanavin
2024-07-22 14:43 ` [OE-core] " Richard Purdie
2024-07-23 7:15 ` Alexander Kanavin
2024-07-23 7:21 ` Richard Purdie
2024-07-23 7:27 ` Alexander Kanavin
2024-07-17 18:22 ` [PATCH 3/4] recipeutils/get_recipe_upgrade_status: group recipes when they need to be upgraded together Alexander Kanavin
2024-07-17 18:38 ` Patchtest results for " patchtest
2024-07-17 18:22 ` [PATCH 4/4] devtool/upgrade: use PN instead of BPN for naming newly created upgraded recipes Alexander Kanavin
2024-07-17 18:38 ` Patchtest results for [PATCH 1/4] lib/oe/recipeutils: return a dict in get_recipe_upgrade_status() instead of a tuple patchtest
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=20240717182216.1661015-1-alex.kanavin@gmail.com \
--to=alex.kanavin@gmail.com \
--cc=alex@linutronix.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