From a278356f75866f89232e3e6230bbf9fb2dc1893c Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Fri, 19 Jan 2018 21:47:26 +1000 Subject: Deprecate --root in favour of --sysroot The --root option was widely misunderstood, and is now replaced by --sysroot. Signed-off-by: Allan McRae --- doc/pacman.8.txt | 10 ---------- src/pacman/pacman.c | 3 ++- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 48958358..a395b777 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -133,16 +133,6 @@ Options *NOTE*: If specified, this is an absolute path, and the root path is not automatically prepended. -*-r, \--root* :: - 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 8c7f715e..98b3f326 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -211,7 +211,6 @@ static void usage(int op, const char * const myname) } addlist(_(" -b, --dbpath set an alternate database location\n")); - addlist(_(" -r, --root set an alternate installation root\n")); addlist(_(" -v, --verbose be verbose\n")); addlist(_(" --arch set an alternate architecture\n")); addlist(_(" --sysroot operate on a mounted guest system (root-only)\n")); @@ -450,6 +449,8 @@ 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; -- cgit v1.2.3-24-g4f1b