[pacman-dev] [PATCH] Revert "Deprecate --root in favour of --sysroot"

[Allan McRae]

The use of --sysroot in the real world has flagged some issues that need
addressing.  Undeprecate --root for now.

This reverts commit a278356f75866f89232e3e6230bbf9fb2dc1893c.

Signed-off-by: Allan McRae <allan at archlinux.org>
---
 doc/pacman.8.asciidoc | 10 ++++++++++
 src/pacman/pacman.c   |  3 +--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/doc/pacman.8.asciidoc b/doc/pacman.8.asciidoc
index b6f4dd76..66483bcb 100644
--- a/doc/pacman.8.asciidoc
+++ b/doc/pacman.8.asciidoc
@@ -130,6 +130,16 @@ Options
 	*NOTE*: If specified, this is an absolute path, and the root path is
 	not automatically prepended.
 
+*-r, \--root* <path>::
+	Specify an alternative installation root (default is `/`). This should
+	not be used as a way to install software into `/usr/local` instead of
+	`/usr`.
+	*NOTE*: If database path or log file are not specified on either the
+	command line or in linkman:pacman.conf[5], their default location will
+	be inside this root path.
+	*NOTE*: This option is not suitable for performing operations on a mounted
+	guest system. See '\--sysroot' instead.
+
 *-v, \--verbose*::
 	Output paths such as as the Root, Conf File, DB Path, Cache Dirs, etc.
 
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index fe54793e..e0178da8 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -211,6 +211,7 @@ static void usage(int op, const char * const myname)
 		}
 
 		addlist(_("  -b, --dbpath <path>  set an alternate database location\n"));
+		addlist(_("  -r, --root <path>    set an alternate installation root\n"));
 		addlist(_("  -v, --verbose        be verbose\n"));
 		addlist(_("      --arch <arch>    set an alternate architecture\n"));
 		addlist(_("      --sysroot        operate on a mounted guest system (root-only)\n"));
@@ -449,8 +450,6 @@ static int parsearg_global(int opt)
 			break;
 		case OP_ROOT:
 		case 'r':
-			pm_printf(ALPM_LOG_WARNING,
-					_("option --root is deprecated; use --sysroot instead\n"));
 			free(config->rootdir);
 			config->rootdir = strdup(optarg);
 			break;
-- 
2.18.0