Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 5771660
Revert "Load all version of a given package into universe"
Baptiste Daroussin committed 11 years ago
commit 577166086b0112d0aec1288be0beeaadf3f34c40
parent 9ccb97d
2 files changed +8 -9
modified libpkg/pkg_jobs_universe.c
@@ -155,7 +155,7 @@ pkg_jobs_universe_add_pkg(struct pkg_jobs_universe *universe, struct pkg *pkg,
		bool force, struct pkg_job_universe_item **found)

{

	struct pkg_job_universe_item *item, *tmp = NULL;
- 
	/*struct pkg_job_seen *seen;*/
+ 
	struct pkg_job_seen *seen;



	pkg_validate(pkg);

	if (pkg->digest == NULL) {
@@ -167,13 +167,13 @@ pkg_jobs_universe_add_pkg(struct pkg_jobs_universe *universe, struct pkg *pkg,
		}

	}
- 
/*	HASH_FIND_STR(universe->seen, pkg->digest, seen);
+ 
	HASH_FIND_STR(universe->seen, pkg->digest, seen);

	if (seen != NULL && !force) {

		if (found != NULL)

			*found = seen->un;



		return (EPKG_END);
- 
	}*/
+ 
	}



	pkg_debug(2, "universe: add new %s pkg: %s, (%s-%s:%s)",

	    (pkg->type == PKG_INSTALLED ? "local" : "remote"), pkg->uid,
@@ -194,7 +194,7 @@ pkg_jobs_universe_add_pkg(struct pkg_jobs_universe *universe, struct pkg *pkg,


	DL_APPEND(tmp, item);
- 
	/*if (seen == NULL) {
+ 
	if (seen == NULL) {

		seen = calloc(1, sizeof(struct pkg_job_seen));

		if (seen == NULL) {

			pkg_emit_errno("pkg_jobs_universe_add_pkg", "calloc: struct pkg_job_seen)");
@@ -204,7 +204,7 @@ pkg_jobs_universe_add_pkg(struct pkg_jobs_universe *universe, struct pkg *pkg,
		seen->un = item;

		HASH_ADD_KEYPTR(hh, universe->seen, seen->digest, strlen(seen->digest),

			seen);
- 
	}*/
+ 
	}



	universe->nitems++;
modified libpkg/pkg_solve.c
@@ -973,7 +973,6 @@ pkg_solve_insert_res_job (struct pkg_solve_variable *var,
			}

			/* Pure install */

			if (seen_del == 0) {
- 
				j->count++;

				res->items[0] = add_var->unit;

				res->type = (j->type == PKG_JOBS_FETCH) ?

								PKG_SOLVED_FETCH : PKG_SOLVED_INSTALL;
@@ -981,8 +980,7 @@ pkg_solve_insert_res_job (struct pkg_solve_variable *var,
				pkg_debug(3, "pkg_solve: schedule installation of %s %s",

					add_var->uid, add_var->digest);

			}
- 
			else if (strcmp(del_var->digest,add_var->digest) != 0) {
- 
				j->count++;
+ 
			else {

				/* Upgrade */

				res->items[0] = add_var->unit;

				res->items[1] = del_var->unit;
@@ -991,6 +989,7 @@ pkg_solve_insert_res_job (struct pkg_solve_variable *var,
				pkg_debug(3, "pkg_solve: schedule upgrade of %s from %s to %s",

					del_var->uid, del_var->digest, add_var->digest);

			}
+ 
			j->count ++;

		}



		/*
@@ -1013,7 +1012,7 @@ pkg_solve_insert_res_job (struct pkg_solve_variable *var,
				DL_APPEND(j->jobs, res);

				pkg_debug(3, "pkg_solve: schedule deletion of %s %s",

					cur_var->uid, cur_var->digest);
- 
				j->count++;
+ 
				j->count ++;

			}

		}

	}