From 3bb41a26623f17ce21aad794a17341dd58db54b4 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 13 Feb 2013 15:47:46 +0100 Subject: [PATCH] xbps-query: changed -M (--list-orphans) shortopt to -O. --- NEWS | 3 +++ bin/xbps-query/main.c | 8 ++++---- bin/xbps-query/xbps-query.8 | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/NEWS b/NEWS index adcb3eda..4b8a5b65 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,8 @@ xbps-0.21 (???): + * xbps-query(8): changed short option -M (--list-orphans) to -O; which + seems more appropiate to use. + * libxbps: when resolving deps in transaction, ignore incorrect ones; for example a package might be depending on itself thru virtual packages. diff --git a/bin/xbps-query/main.c b/bin/xbps-query/main.c index f390c16a..d84af8e8 100644 --- a/bin/xbps-query/main.c +++ b/bin/xbps-query/main.c @@ -51,7 +51,7 @@ usage(bool fail) " -l --list-pkgs List available packages\n" " -L --list-repos List working repositories\n" " -m --list-manual-pkgs List packages installed explicitly\n" - " -M --list-orphans List package orphans\n" + " -O --list-orphans List package orphans\n" " -o --ownedby PATTERN(s) Search for packages owning PATTERN(s)\n" " -s --search PATTERN(s) Search for packages matching PATTERN(s)\n" " -f --files Show files for PKGNAME\n" @@ -65,7 +65,7 @@ usage(bool fail) int main(int argc, char **argv) { - const char *shortopts = "C:c:D:dfhLlmMop:Rr:sVvXx"; + const char *shortopts = "C:c:D:dfhLlmOop:Rr:sVvXx"; const struct option longopts[] = { { "config", required_argument, NULL, 'C' }, { "cachedir", required_argument, NULL, 'c' }, @@ -75,7 +75,7 @@ main(int argc, char **argv) { "list-repos", no_argument, NULL, 'L' }, { "list-pkgs", no_argument, NULL, 'l' }, { "list-manual-pkgs", no_argument, NULL, 'm' }, - { "list-orphans", no_argument, NULL, 'M' }, + { "list-orphans", no_argument, NULL, 'O' }, { "ownedby", no_argument, NULL, 'o' }, { "property", required_argument, NULL, 'p' }, { "repository-mode", no_argument, NULL, 'R' }, @@ -131,7 +131,7 @@ main(int argc, char **argv) case 'm': list_manual = true; break; - case 'M': + case 'O': orphans = true; break; case 'o': diff --git a/bin/xbps-query/xbps-query.8 b/bin/xbps-query/xbps-query.8 index 9aed1af7..dbfef4ea 100644 --- a/bin/xbps-query/xbps-query.8 +++ b/bin/xbps-query/xbps-query.8 @@ -1,4 +1,4 @@ -.Dd February 2, 2013 +.Dd February 13, 2013 .Os Void Linux .Dt xbps-query 8 .Sh NAME @@ -105,7 +105,7 @@ Lists registered and working repositories. .It Fl m, Fl -list-manual-pkgs Lists registered packages in the package database (pkgdb) that were installed manually by the user (i.e not as dependency of any package). -.It Fl M, Fl -list-orphans +.It Fl O, Fl -list-orphans Lists package orphans in the package database (pkgdb), i.e packages that were installed as dependencies and no package is currently depending on them directly.