Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › f4e83c2
Add a temporary workaround.
Vsevolod Stakhov committed 11 years ago
commit f4e83c2f8f1679b0e30dfd1b8e4fb22cdae1523a
parent ab51163
2 files changed +3 -5
modified libpkg/pkg_jobs.c
@@ -790,14 +790,12 @@ pkg_jobs_try_remote_candidate(struct pkg_jobs *j, const char *pattern,
			else

				assert(0);
- 
			rc = pkg_jobs_process_remote_pkg(j, p, NULL);
+ 
			rc = EPKG_OK;
+ 
			pkg_jobs_process_remote_pkg(j, p, NULL);

			if (rc == EPKG_OK) {

				/* Avoid freeing */

				p = NULL;

			}
- 
			else {
- 
				assert(0);
- 
			}

			break;

		}

		sbuf_reset(qmsg);
modified libpkg/pkg_solve.c
@@ -473,7 +473,7 @@ pkg_solve_add_request_rule(struct pkg_solve_problem *problem,
		cnt ++;

	}
- 
	if (cnt > 1) {
+ 
	if (cnt > 1 && var->unit->hh.keylen != 0) {

		LL_PREPEND(problem->rules, rule);

		problem->rules_count ++;

		/* Also need to add pairs of conflicts */