8220b04 Fix operators precendence. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix operators precendence.

Vsevolod Stakhov committed 12 years ago

commit 8220b04cc5cbbe11841ff8a55bc62a8c90db58ad
parent 7d9ebad

2 files changed +0 -13

modified libpkg/pkg_delete.c

@@ -50,17 +50,6 @@ pkg_delete(struct pkg *pkg, struct pkgdb *db, unsigned flags)

 	assert(pkg != NULL);
 	assert(db != NULL);
 	/*
 	 * Do not trust the existing entries as it may have changed if we
 	 * delete packages in batch.
 	 */
 	pkg_list_free(pkg, PKG_RDEPS);
 	/*
 	 * Ensure that we have all the informations we need
 	 */
 	if ((ret = pkgdb_load_rdeps(db, pkg)) != EPKG_OK)
 		return (ret);
 	if ((ret = pkgdb_load_files(db, pkg)) != EPKG_OK)
 		return (ret);
 	if ((ret = pkgdb_load_dirs(db, pkg)) != EPKG_OK)

modified libpkg/pkg_jobs.c

@@ -1295,11 +1295,9 @@ pkg_jobs_execute(struct pkg_jobs *j)

 				pkg_emit_error("Cannot delete pkg itself without force flag");
 				continue;
 			}
 			pkg_emit_deinstall_begin(p);
 			retcode = pkg_delete(p, j->db, flags);
 			if (retcode != EPKG_OK)
 				goto cleanup;
 			pkg_emit_deinstall_finished(p);
 			break;
 		case PKG_SOLVED_INSTALL:
 			retcode = pkg_jobs_handle_install(ps->pkg[0], NULL,