Radish alpha
H
HardenedBSD-pkg
HardenedBSD Package Manager
Radicle
Git (anonymous pull)
Log in to clone via SSH
Commits ›
Do not check integrity if no packages were added.
Vsevolod Stakhov committed 12 years ago
commit 1f63c96a72850df418c66a6d7e87b6b404754ed5
parent 3037cc26d4f18b96d55d4d7e2520dadfb738fd40
1 file changed +5 -2
modified libpkg/pkg_jobs.c
@@ -1494,7 +1494,7 @@ pkg_jobs_check_conflicts(struct pkg_jobs *j)
	struct pkg *pkg = NULL;

	const char *cachedir = NULL;

	char path[MAXPATHLEN];
- 
	int ret = EPKG_OK, res;
+ 
	int ret = EPKG_OK, res, added = 0;



	if (pkg_config_string(PKG_CONFIG_CACHEDIR, &cachedir) != EPKG_OK)

		return (EPKG_FATAL);
@@ -1520,12 +1520,15 @@ pkg_jobs_check_conflicts(struct pkg_jobs *j)
			if (ret == EPKG_FATAL)

				break;

		}
+ 
		else {
+ 
			added ++;
+ 
		}

	}

	pkg_manifest_keys_free(keys);



	pkg_free(pkg);
- 
	if (ret != EPKG_FATAL) {
+ 
	if (added > 0 && ret != EPKG_FATAL) {

		if ((res = pkg_conflicts_integrity_check(j)) != EPKG_OK)

			return (res);

	}