diff options
| author | Chantry Xavier <shiningxc@gmail.com> | 2008-01-10 15:59:43 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-01-11 05:58:19 +0100 |
| commit | aec7c13648179e6d77d1fea9233e35fb9f9d1e05 (patch) | |
| tree | 93bebd083f9a8d333a43cb8baf1e4dce3514b39a /src | |
| parent | abd14fdac0c6ab834b0bbeb423e7a8f5a3978b87 (diff) | |
| download | pacman-aec7c13648179e6d77d1fea9233e35fb9f9d1e05.tar.gz pacman-aec7c13648179e6d77d1fea9233e35fb9f9d1e05.tar.xz | |
Rename -t --orphans to -t --unrequired (FS#9144).
It turns out the orphan name was misleading. Real orphans are packages
installed as dependency no longer required by any others (-Qtd).
The -t option only shows package not required by any others, so --unrequired
describes it better.
Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/pacman/conf.h | 2 | ||||
| -rw-r--r-- | src/pacman/pacman.c | 6 | ||||
| -rw-r--r-- | src/pacman/query.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/pacman/conf.h b/src/pacman/conf.h index f3631ae1..f804f560 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -44,7 +44,7 @@ typedef struct __config_t { unsigned short op_q_info; unsigned short op_q_list; unsigned short op_q_foreign; - unsigned short op_q_orphans; + unsigned short op_q_unrequired; unsigned short op_q_deps; unsigned short op_q_explicit; unsigned short op_q_owns; diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 1b8724ba..4a948160 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -108,7 +108,7 @@ static void usage(int op, const char * const myname) printf(_(" -o, --owns <file> query the package that owns <file>\n")); printf(_(" -p, --file <package> query a package file instead of the database\n")); printf(_(" -s, --search <regex> search locally-installed packages for matching strings\n")); - printf(_(" -t, --orphans list all packages not required by any package\n")); + printf(_(" -t, --unrequired list all packages not required by any package\n")); printf(_(" -u, --upgrades list all packages that can be upgraded\n")); printf(_(" -q, --quiet show less information for query and search\n")); } else if(op == PM_OP_SYNC) { @@ -325,7 +325,7 @@ static int parseargs(int argc, char *argv[]) {"root", required_argument, 0, 'r'}, {"recursive", no_argument, 0, 's'}, {"search", no_argument, 0, 's'}, - {"orphans", no_argument, 0, 't'}, + {"unrequired", no_argument, 0, 't'}, {"upgrades", no_argument, 0, 'u'}, {"sysupgrade", no_argument, 0, 'u'}, {"verbose", no_argument, 0, 'v'}, @@ -461,7 +461,7 @@ static int parseargs(int argc, char *argv[]) config->flags |= PM_TRANS_FLAG_RECURSE; break; case 't': - config->op_q_orphans = 1; + config->op_q_unrequired = 1; break; case 'u': config->op_s_upgrade = 1; diff --git a/src/pacman/query.c b/src/pacman/query.c index d0f1e96a..fd2f7927 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -263,7 +263,7 @@ static int is_foreign(pmpkg_t *pkg) return(0); } -static int is_orphan(pmpkg_t *pkg) +static int is_unrequired(pmpkg_t *pkg) { alpm_list_t *requiredby = alpm_pkg_compute_requiredby(pkg); if(requiredby == NULL) { @@ -289,8 +289,8 @@ static int filter(pmpkg_t *pkg) if(config->op_q_foreign && !is_foreign(pkg)) { return(0); } - /* check if this pkg is orphaned */ - if(config->op_q_orphans && !is_orphan(pkg)) { + /* check if this pkg is unrequired */ + if(config->op_q_unrequired && !is_unrequired(pkg)) { return(0); } return(1); |