Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › f66cd9b
Kill PKG_PLUGINS_SUMMARY has pkg plugins already do the same job
Baptiste Daroussin committed 13 years ago
commit f66cd9bd0a40e67fab2019b87b6b9077b01f2ae4
parent 5f453b5
5 files changed +4 -35
modified libpkg/pkg.h
@@ -266,7 +266,6 @@ typedef enum _pkg_config_key {
	PKG_CONFIG_PLUGINS_DIR,

	PKG_CONFIG_ENABLE_PLUGINS,

	PKG_CONFIG_PLUGINS,
- 
	PKG_CONFIG_PLUGINS_SUMMARY,

	PKG_CONFIG_DEBUG_SCRIPTS,

} pkg_config_key;
modified libpkg/pkg_config.c
@@ -198,12 +198,6 @@ static struct config_entry c[] = {
		"NULL",

		{ NULL }

	},
- 
	[PKG_CONFIG_PLUGINS_SUMMARY] = {
- 
		BOOL,
- 
		"PKG_PLUGINS_SUMMARY",
- 
		"NO",
- 
		{ NULL }
- 
	},

	[PKG_CONFIG_DEBUG_SCRIPTS] = {

		BOOL,

		"DEBUG_SCRIPTS",
modified libpkg/plugins.c
@@ -59,7 +59,6 @@ struct pkg_plugins {


STAILQ_HEAD(plugins_head, pkg_plugins);

static struct plugins_head ph = STAILQ_HEAD_INITIALIZER(ph);
- 
static unsigned int have_plugins_loaded = 0;



static int pkg_plugins_free(void);

static int pkg_plugins_hook_free(struct pkg_plugins *p);
@@ -219,24 +218,6 @@ pkg_plugins_get(struct pkg_plugins *p, pkg_plugins_key key)
}



int
- 
pkg_plugins_display_loaded(void)
- 
{
- 
	struct pkg_plugins *p = NULL;
-
- 
	if (STAILQ_EMPTY(&ph) || have_plugins_loaded == 0)
- 
		return (EPKG_OK);
-
- 
	printf("Plugin(s) loaded: [ ");
-
- 
	while (pkg_plugins_list(&p) != EPKG_END)
- 
		printf("'%s' ", pkg_plugins_get(p, PKG_PLUGINS_NAME));
-
- 
	printf("]\nSuccessfully loaded %d plugin(s)\n", have_plugins_loaded);
-
- 
	return (EPKG_OK);
- 
}
-
- 
int

pkg_plugins_list(struct pkg_plugins **plugin)

{

	assert(&ph != NULL);
modified pkg/main.c
@@ -201,7 +201,7 @@ main(int argc, char **argv)
	int version = 0;

	int ret = EX_OK;

	const char *buf = NULL;
- 
	bool b, plugins_enabled = false, plugins_summary = false;
+ 
	bool b, plugins_enabled = false;

	struct pkg_config_kv *kv = NULL;

	struct plugcmd *c;

	struct pkg_plugins *p = NULL;
@@ -287,10 +287,6 @@ main(int argc, char **argv)
				STAILQ_INSERT_TAIL(&plugins, c, next);

			}

		}
-
- 
		pkg_config_bool(PKG_CONFIG_PLUGINS_SUMMARY, &plugins_summary);
- 
		if (plugins_summary)
- 
			pkg_plugins_display_loaded();

	}



	if (version > 1) {
modified pkg/pkg.conf.sample
@@ -8,16 +8,15 @@ PACKAGESITE : http://pkg.freebsd.org/${ABI}/latest
#PKG_CACHEDIR	    : /var/cache/pkg

#PORTSDIR	    : /usr/ports

#PUBKEY		    : /etc/ssl/pkg.conf
- 
#HANDLE_RC_SCRIPTS   : NO
+ 
#HANDLE_RC_SCRIPTS  : NO

#PKG_MULTIREPOS	    : NO
- 
#ASSUME_ALWAYS_YES   : NO
+ 
#ASSUME_ALWAYS_YES  : NO

#SYSLOG		    : YES

#SHLIBS		    : NO

#AUTODEPS	    : NO

#PORTAUDIT_SITE	    : http://portaudit.FreeBSD.org/auditfile.tbz

#PKG_PLUGINS_DIR    : /usr/local/lib/pkg/plugins
- 
#PKG_ENABLE_PLUGINS  : NO
- 
#PKG_PLUGINS_SUMMARY : NO
+ 
#PKG_ENABLE_PLUGINS : YES

#PLUGINS	    : [commands/mystat]



# Repository definitions