Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 56022a2
Direct check of pkg->locked
Baptiste Daroussin committed 11 years ago
commit 56022a22144aa3053508d9149865037dfb85d63b
parent c1626df
5 files changed +9 -9
modified libpkg/pkg_add.c
@@ -310,7 +310,7 @@ pkg_add_check_pkg_archive(struct pkgdb *db, struct pkg *pkg,
			pkg_inst = NULL;

			return (EPKG_INSTALLED);

		}
- 
		else if (pkg_is_locked(pkg_inst)) {
+ 
		else if (pkg_inst->locked) {

			pkg_emit_locked(pkg_inst);

			pkg_free(pkg_inst);

			pkg_inst = NULL;
modified libpkg/pkg_delete.c
@@ -59,7 +59,7 @@ pkg_delete(struct pkg *pkg, struct pkgdb *db, unsigned flags)
		pkg_emit_deinstall_begin(pkg);



	/* If the package is locked */
- 
	if (pkg_is_locked(pkg)) {
+ 
	if (pkg->locked) {

		pkg_emit_locked(pkg);

		return (EPKG_LOCKED);

	}
modified libpkg/pkg_jobs.c
@@ -355,7 +355,7 @@ pkg_jobs_add_req(struct pkg_jobs *j, struct pkg *pkg)
		return (NULL);

	}
- 
	if (pkg_is_locked(pkg)) {
+ 
	if (pkg->locked) {

		pkg_emit_locked(pkg);

		return (NULL);

	}
@@ -1036,7 +1036,7 @@ pkg_jobs_need_upgrade(struct pkg *rp, struct pkg *lp)
		return true;



	/* Do not upgrade locked packages */
- 
	if (pkg_is_locked(lp)) {
+ 
	if (lp->locked) {

		pkg_emit_locked(lp);

		return (false);

	}
@@ -1283,7 +1283,7 @@ jobs_solve_deinstall(struct pkg_jobs *j)


		while (pkgdb_it_next(it, &pkg,

				PKG_LOAD_BASIC|PKG_LOAD_RDEPS|PKG_LOAD_DEPS|PKG_LOAD_ANNOTATIONS) == EPKG_OK) {
- 
			if(pkg_is_locked(pkg)) {
+ 
			if(pkg->locked) {

				pkg_emit_locked(pkg);

			}

			else {
@@ -1311,7 +1311,7 @@ jobs_solve_autoremove(struct pkg_jobs *j)
	while (pkgdb_it_next(it, &pkg,

			PKG_LOAD_BASIC|PKG_LOAD_RDEPS|PKG_LOAD_DEPS|PKG_LOAD_ANNOTATIONS)

			== EPKG_OK) {
- 
		if(pkg_is_locked(pkg)) {
+ 
		if(pkg->locked) {

			pkg_emit_locked(pkg);

		}

		else if (pkg_jobs_test_automatic(j, pkg)) {
@@ -1534,7 +1534,7 @@ jobs_solve_fetch(struct pkg_jobs *j)
			return (EPKG_FATAL);



		while (pkgdb_it_next(it, &pkg, PKG_LOAD_BASIC) == EPKG_OK) {
- 
			if(pkg_is_locked(pkg)) {
+ 
			if(pkg->locked) {

				pkg_emit_locked(pkg);

			}

			else {
modified libpkg/pkg_jobs_universe.c
@@ -816,7 +816,7 @@ pkg_jobs_universe_process_upgrade_chains(struct pkg_jobs *j)
			vercnt ++;

		}
- 
		if (local != NULL && pkg_is_locked(local->pkg)) {
+ 
		if (local != NULL && local->pkg->locked) {

			LL_FOREACH(unit, cur) {

				HASH_FIND_PTR(j->request_add, &cur, req);

				if (req != NULL)
modified libpkg/pkg_printf.c
@@ -1570,7 +1570,7 @@ format_lock_status(struct sbuf *sbuf, const void *data, struct percent_esc *p)
{

	const struct pkg	*pkg = data;
- 
	return (bool_val(sbuf, pkg_is_locked(pkg), p));
+ 
	return (bool_val(sbuf, pkg->locked, p));

}



/*