Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 76c0be7
No recursive pkg_add() calls with pkg_jobs
Julien Laffaye committed 14 years ago
commit 76c0be78a93801d4d463404f6f24712fe8485587
parent 91e0b5a
2 files changed +2 -2
modified libpkg/pkg_add.c
@@ -204,7 +204,7 @@ pkg_add(struct pkgdb *db, const char *path, int flags)
					 pkg_dep_get(dep, PKG_DEP_NAME), pkg_dep_get(dep, PKG_DEP_VERSION),

					 ext);
- 
			if (access(dpath, F_OK) == 0) {
+ 
			if ((flags & PKG_ADD_UPGRADE) == 0 && access(dpath, F_OK) == 0) {

				if (pkg_add(db, dpath, PKG_ADD_AUTOMATIC) != EPKG_OK) {

					retcode = EPKG_FATAL;

					goto cleanup;
modified libpkg/pkg_jobs.c
@@ -52,7 +52,7 @@ pkg_jobs_new(struct pkg_jobs **j, pkg_jobs_t t, struct pkgdb *db)
	if (pkgdb_lock(db) != EPKG_OK)

		return (EPKG_FATAL);
- 
	if((*j = calloc(1, sizeof(struct pkg_jobs))) == NULL) {
+ 
	if ((*j = calloc(1, sizeof(struct pkg_jobs))) == NULL) {

		pkg_emit_errno("calloc", "pkg_jobs");

		return (EPKG_FATAL);

	}