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>

6 files changed, 10 insertions, 16 deletions

diff --git a/contrib/bash_completion b/contrib/bash_completion
index d0851e70..77192858 100644
--- a/contrib/bash_completion
+++ b/contrib/bash_completion
@@ -177,7 +177,7 @@ _pacman ()
           changelog) mod="${mod}c" ;;
           deps) mod="${mod}d" ;;
           explicit) mod="${mod}e" ;;
-          orphans) mod="${mod}t" ;;
+          unrequired) mod="${mod}t" ;;
           foreign) mod="${mod}m" ;;
           owns) mod="${mod}o" ;;
           file) mod="${mod}p" ;;
@@ -298,7 +298,7 @@ _pacman ()
           -o --owns \
           -p --file \
           -s --search \
-          -t --orphans \
+          -t --unrequired \
           -u --upgrades \
           --config \
           --logfile \
diff --git a/contrib/zsh_completion b/contrib/zsh_completion
index f6cd9008..5ea6c33b 100644
--- a/contrib/zsh_completion
+++ b/contrib/zsh_completion
@@ -38,7 +38,6 @@ _pacman_opts_pkgfile=(
 
 # options for passing to _arguments: subactions for --query command
 _pacman_opts_query_actions=(
-	'-e[List orphaned packages]:*:orphans:->query_orphans'
 	'-g[View all members of a package group]:*:package groups:->query_group'
 	'-o[Query the package that owns a file]:file:_files'
 	'-p[Package file to query]:*:package file:->query_file'
@@ -135,11 +134,6 @@ _pacman_action_query() {
 				"$_pacman_opts_query_modifiers[@]" \
 				'*:groups:_pacman_completions_installed_groups'
 				;;
-		query_orphans)
-			_arguments -s : \
-				"$_pacman_opts_common[@]" \
-				"$_pacman_opts_query_modifiers[@]"
-				;;
 		query_owner)
 			_arguments -s : \
 				"$_pacman_opts_common[@]" \
diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt
index 02e5caf7..0da83a67 100644
--- a/doc/pacman.8.txt
+++ b/doc/pacman.8.txt
@@ -194,7 +194,7 @@ Query Options[[QO]]
 	This will search each locally-installed package for names or
 	descriptions that match `regexp`.
 
-*-t, \--orphans*::
+*-t, \--unrequired*::
 	Restrict or filter output to packages not required by any currently
 	installed package.
 
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);