bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Deprecate --root in favour of --sysroot"

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

This reverts commit a278356f75.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2018-07-19 12:51:07 +10:00
parent acef70c103
commit 0adb36346c
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
doc/pacman.8.asciidoc
View file

@ -130,6 +130,16 @@ Options
*NOTE*: If specified, this is an absolute path, and the root path is *NOTE*: If specified, this is an absolute path, and the root path is
not automatically prepended. 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*:: *-v, \--verbose*::
Output paths such as as the Root, Conf File, DB Path, Cache Dirs, etc. Output paths such as as the Root, Conf File, DB Path, Cache Dirs, etc.

3
src/pacman/pacman.c
View file

@ -211,6 +211,7 @@ static void usage(int op, const char * const myname)
} }
addlist(_(" -b, --dbpath <path> set an alternate database location\n")); 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(_(" -v, --verbose be verbose\n"));
addlist(_(" --arch <arch> set an alternate architecture\n")); addlist(_(" --arch <arch> set an alternate architecture\n"));
addlist(_(" --sysroot operate on a mounted guest system (root-only)\n")); addlist(_(" --sysroot operate on a mounted guest system (root-only)\n"));
@ -449,8 +450,6 @@ static int parsearg_global(int opt)
break; break;
case OP_ROOT: case OP_ROOT:
case 'r': case 'r':
pm_printf(ALPM_LOG_WARNING,
_("option --root is deprecated; use --sysroot instead\n"));
free(config->rootdir); free(config->rootdir);
config->rootdir = strdup(optarg); config->rootdir = strdup(optarg);
break; break;