Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 6ac9dc0
Rename PKG_ADD_UPGRADE_NEW to PKG_ADD_USE_UPGRADE_SCRIPTS to better reflect its function.
Matthew Seaman committed 13 years ago
commit 6ac9dc0a7ec6346f8f00f293e65af8207371411b
parent 8409bf1
2 files changed +3 -3
modified libpkg/pkg.h
@@ -790,7 +790,7 @@ int pkgdb_compact(struct pkgdb *db);
int pkg_add(struct pkgdb *db, const char *path, int flags);



#define PKG_ADD_UPGRADE (1 << 0)
- 
#define PKG_ADD_UPGRADE_NEW (1 << 1)
+ 
#define PKG_ADD_USE_UPGRADE_SCRIPTS (1 << 1)

#define PKG_ADD_AUTOMATIC (1 << 2)

#define PKG_ADD_FORCE (1 << 3)
modified libpkg/pkg_add.c
@@ -238,7 +238,7 @@ pkg_add(struct pkgdb *db, const char *path, int flags)
	/*

	 * Execute pre-install scripts

	 */
- 
	if ((flags & PKG_ADD_UPGRADE_NEW) == 0)
+ 
	if ((flags & PKG_ADD_USE_UPGRADE_SCRIPTS) == 0)

		pkg_script_run(pkg, PKG_SCRIPT_PRE_INSTALL);



	/* add the user and group if necessary */
@@ -257,7 +257,7 @@ pkg_add(struct pkgdb *db, const char *path, int flags)
	/*

	 * Execute post install scripts

	 */
- 
	if (flags & PKG_ADD_UPGRADE_NEW)
+ 
	if (flags & PKG_ADD_USE_UPGRADE_SCRIPTS)

		pkg_script_run(pkg, PKG_SCRIPT_POST_UPGRADE);

	else

		pkg_script_run(pkg, PKG_SCRIPT_POST_INSTALL);