Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 8a2958f
Display loaded plugins only if enabled PKG_PLUGINS_SUMMARY
Marin Atanasov Nikolov committed 13 years ago
commit 8a2958fe3cd34760d88ef2b1403b9632855d88ca
parent 034b957
3 files changed +13 -4
modified libpkg/pkg.h
@@ -263,7 +263,8 @@ typedef enum _pkg_config_key {
	PKG_CONFIG_SRV_MIRROR,

	PKG_CONFIG_FETCH_RETRY,

	PKG_CONFIG_PLUGINS_DIR,
- 
	PKG_CONFIG_ENABLE_PLUGINS
+ 
	PKG_CONFIG_ENABLE_PLUGINS,
+ 
	PKG_CONFIG_PLUGINS_SUMMARY

} pkg_config_key;



typedef enum {
modified libpkg/pkg_config.c
@@ -185,6 +185,12 @@ static struct config_entry c[] = {
		"NO",

		{ NULL }

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

};



static bool parsed = false;
modified pkg/main.c
@@ -174,7 +174,7 @@ main(int argc, char **argv)
	int version = 0;

	int ret = EX_OK;

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

	struct pkg_config_kv *kv = NULL;

	

	/* Set stdout unbuffered */
@@ -248,9 +248,11 @@ main(int argc, char **argv)
	if (plugins_enabled) {

		if (pkg_plugins_init() != EPKG_OK)

			errx(EX_SOFTWARE, "Plugins cannot be loaded");
- 
	}
- 
	pkg_plugins_display_loaded();
+ 
		pkg_config_bool(PKG_CONFIG_PLUGINS_SUMMARY, &plugins_summary);
+ 
		if (plugins_summary)
+ 
			pkg_plugins_display_loaded();
+ 
	}



	if (version > 1) {

		printf("version: "PKGVERSION""GITHASH"\n");