Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2019-01-10 13:52:58 +1000
committerAllan McRae <allan@archlinux.org>2019-01-10 14:14:04 +1000
commit03d85763e08cbe7c5ef1f9863cf25e026ee2756f (patch)
tree5a4fc21a9f771c92da50d602c9a241126e62cf52 /src
parente9d91a688d1a2ebe58e8a895853debf745a529cf (diff)
Add [ignored] to -Qu output for packages in repos that are not Usage = Upgrade
List all available updates in -Qu output, but include [ignored] beside those that will not be updated in a -Su operation due to thier repo Usage value (in addition to those that are Ignored). Fixes FS#59854. The following people provided initial patches to print [ignored] on -Qu operations, which highlighted a larger problem to be fixed first: With-thanks-to: morganamilo <morganamilo@gmail.com> With-thanks-to: Michael Straube <michael.straube@posteo.de> Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'src')
-rw-r--r--src/pacman/query.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/pacman/query.c b/src/pacman/query.c
index 9ac6e930..3e728257 100644
--- a/src/pacman/query.c
+++ b/src/pacman/query.c
@@ -325,10 +325,14 @@ static int display(alpm_pkg_t *pkg)
colstr->version, alpm_pkg_get_version(pkg), colstr->nocolor);
if(config->op_q_upgrade) {
+ int usage;
alpm_pkg_t *newpkg = alpm_sync_get_new_version(pkg, alpm_get_syncdbs(config->handle));
+ alpm_db_t *db = alpm_pkg_get_db(newpkg);
+ alpm_db_get_usage(db, &usage);
+
printf(" -> %s%s%s", colstr->version, alpm_pkg_get_version(newpkg), colstr->nocolor);
- if(alpm_pkg_should_ignore(config->handle, pkg)) {
+ if(alpm_pkg_should_ignore(config->handle, pkg) || !(usage & ALPM_DB_USAGE_UPGRADE)) {
printf(" %s", _("[ignored]"));
}
}