Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 2948ff5
Fix respecting priority for requested packages
Baptiste Daroussin committed 9 years ago
commit 2948ff519cbf99c8df51223d0c879c92e884ae2c
parent 27a4674
1 file changed +9 -3
modified libpkg/pkg_jobs_universe.c
@@ -175,9 +175,15 @@ pkg_jobs_universe_add_pkg(struct pkg_jobs_universe *universe, struct pkg *pkg,


		DL_FOREACH(seen, tmp) {

			if (tmp->pkg == pkg || (tmp->pkg->type == pkg->type &&
- 
					strcmp (tmp->pkg->digest, pkg->digest) == 0)) {
- 
				same_package = true;
- 
				break;
+ 
			    strcmp(tmp->pkg->digest, pkg->digest) == 0)) {
+ 
				if (tmp->pkg->reponame != NULL) {
+ 
					if (strcmp(tmp->pkg->reponame, pkg->reponame) == 0) {
+ 
						same_package = true;
+ 
					}
+ 
				} else {
+ 
					same_package = true;
+ 
					break;
+ 
				}

			}

		}