Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 94c4488
Remove DISABLE_MTREE option which is now no-op
Baptiste Daroussin committed 11 years ago
commit 94c448811c3f7d49edd49d6d3359438b9dead74e
parent 7254325
4 files changed +0 -27
modified docs/pkg.conf.5
@@ -107,25 +107,6 @@ suggestions to the output of
as an aide to port maintainers, including indicating when the port

might be marked as architecture independent.

Default: no.
- 
.It Cm DISABLE_MTREE: boolean
- 
For experimental purposes only.
- 
Not for use on production systems.
- 
All this option does is prevent processing of
- 
.Cm +MTREE
- 
data when installing a package.
- 
.Cm +MTREE
- 
files are a legacy feature of the ports tree, which provide functionality
- 
necessary for
- 
.Xr pkg-install 8
- 
as it cannot handle creating arbitrary directory hierarchies otherwise.
- 
.Xr pkg 8
- 
can create such directory structures natively, but currently still uses the
- 
.Cm +MTREE
- 
data.
- 
This option exists to facilitate developing
- 
.Cm +MTREE
- 
free package sets.
- 
Default: no.

.It Cm EVENT_PIPE: string

Send all event messages to the specified fifo or Unix socket.

Events messages should be formatted as JSON.
modified libpkg/pkg_config.c
@@ -246,12 +246,6 @@ static struct config_entry c[] = {
		"Environment variables pkg will use",

	},

	{
- 
		PKG_BOOL,
- 
		"DISABLE_MTREE",
- 
		"NO",
- 
		"Experimental: disable MTREE processing on pkg installation",
- 
	},
- 
	{

		PKG_STRING,

		"PKG_SSH_ARGS",

		NULL,
modified src/pkg.conf.sample
@@ -41,7 +41,6 @@
#SSH_RESTRICT_DIR = "";

#PKG_ENV {

#}
- 
#DISABLE_MTREE = false;

#PKG_SSH_ARGS = "";

#DEBUG_LEVEL = 0;

#ALIAS {
modified tests/frontend/pkg.shin
@@ -44,7 +44,6 @@ pkg_config_defaults_body()
	-o match:'^ *FETCH_TIMEOUT = 30;$' \

	-o match:'^ *UNSET_TIMESTAMP = false;$' \

	-o match:'^ *SSH_RESTRICT_DIR = "";$' \
- 
	-o match:'^ *DISABLE_MTREE = false;$' \

	-e empty              \

	-s exit:0             \

	env -i PATH=${PATH} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} pkg -C "" -R "" -vv