From: Jon Turney <jon.turney@dronecode.org.uk>
To: cygwin-apps@cygwin.com
Cc: Jon Turney <jon.turney@dronecode.org.uk>
Subject: [PATCH setup 09/11] Use stored action in packagemeta::list_actions()
Date: Thu, 01 Aug 2019 16:08:00 -0000 [thread overview]
Message-ID: <20190801160519.32745-10-jon.turney@dronecode.org.uk> (raw)
In-Reply-To: <20190801160519.32745-1-jon.turney@dronecode.org.uk>
Use the stored action in packagemeta::list_actions(), rather than
working backwards from desired/installed/picked.
---
package_meta.cc | 26 ++++++--------------------
1 file changed, 6 insertions(+), 20 deletions(-)
diff --git a/package_meta.cc b/package_meta.cc
index 2564f95..8fad50d 100644
--- a/package_meta.cc
+++ b/package_meta.cc
@@ -490,34 +490,20 @@ packagemeta::toggle_action ()
ActionList *
packagemeta::list_actions(trusts const trust)
{
- // first work out the current action, so we can indicate that
- _actions action;
-
- if (!desired && installed)
- action = Uninstall_action;
- else if (!desired)
- action = NoChange_action; // skip
- else if (desired == installed && picked())
- action = Reinstall_action;
- else if (desired == installed)
- action = NoChange_action; // keep
- else
- action = Install_action;
-
- // now build the list of possible actions
+ // build the list of possible actions
ActionList *al = new ActionList();
- al->add("Uninstall", (int)Uninstall_action, (action == Uninstall_action), bool(installed));
- al->add("Skip", (int)NoChange_action, (action == NoChange_action) && !installed, !installed);
+ al->add("Uninstall", (int)Uninstall_action, (_action == Uninstall_action), bool(installed));
+ al->add("Skip", (int)NoChange_action, (_action == NoChange_action) && !installed, !installed);
std::set<packageversion>::iterator i;
for (i = versions.begin (); i != versions.end (); ++i)
{
if (*i == installed)
{
- al->add("Keep", (int)NoChange_action, (action == NoChange_action), TRUE);
+ al->add("Keep", (int)NoChange_action, (_action == NoChange_action), TRUE);
al->add(packagedb::task == PackageDB_Install ? "Reinstall" : "Retrieve",
- (int)Reinstall_action, (action == Reinstall_action), TRUE);
+ (int)Reinstall_action, (_action == Reinstall_action), TRUE);
}
else
{
@@ -526,7 +512,7 @@ packagemeta::list_actions(trusts const trust)
label += " (Test)";
al->add(label,
-std::distance(versions.begin (), i),
- (action == Install_action) && (*i == desired),
+ (_action == Install_action) && (*i == desired),
TRUE);
}
}
--
2.21.0
next prev parent reply other threads:[~2019-08-01 16:08 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-01 16:05 [PATCH setup 00/11] Improve handling of specifying an obsolete package to be installed on the command line Jon Turney
2019-08-01 16:05 ` [PATCH setup 02/11] Remove unused packagemeta::key Jon Turney
2019-08-01 16:05 ` [PATCH setup 01/11] Remove 'Bin?' column Jon Turney
2019-08-01 16:06 ` [PATCH setup 03/11] Make packagemeta::message private Jon Turney
2019-08-01 16:07 ` [PATCH setup 05/11] Store the requested action in packagemeta::set_action() Jon Turney
2019-08-01 16:07 ` [PATCH setup 06/11] Use packagemeta::set_action() to update action Jon Turney
2019-08-01 16:07 ` [PATCH setup 04/11] Rename 'Default' packagemeta action to 'NoChange' for clarity Jon Turney
2019-08-01 16:08 ` [PATCH setup 08/11] Allow better handling of an obsolete package specified on command line Jon Turney
2019-08-01 16:08 ` [PATCH setup 07/11] Use stored action in setting up solver Jon Turney
2019-08-01 16:08 ` Jon Turney [this message]
2019-08-01 16:09 ` [PATCH setup 10/11] Use stored action in packagemeta::action_caption() Jon Turney
2019-08-01 16:10 ` [PATCH setup 11/11] Ensure we only set user_picked when appropriate Jon Turney
2019-12-01 19:32 ` [PATCH setup 00/11] Improve handling of specifying an obsolete package to be installed on the command line Ken Brown
2019-12-03 20:44 ` Jon Turney
2019-12-03 21:16 ` Ken Brown
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=20190801160519.32745-10-jon.turney@dronecode.org.uk \
--to=jon.turney@dronecode.org.uk \
--cc=cygwin-apps@cygwin.com \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).