Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 416f719
Appease a bit gcc 4.8 (which found an interesting potential bug)
Baptiste Daroussin committed 11 years ago
commit 416f719494968567ba3fd5c4727bcbe4e6c514c1
parent ee23a3e
1 file changed +2 -5
modified libpkg/pkg_jobs.c
@@ -402,7 +402,7 @@ pkg_jobs_process_add_request(struct pkg_jobs *j, bool top)
{

	bool force = j->flags & PKG_FLAG_FORCE,

		 reverse = j->flags & PKG_FLAG_RECURSIVE,
- 
		 upgrade = j->type == PKG_UPGRADE;
+ 
		 upgrade = j->type == PKG_JOBS_UPGRADE;

	struct pkg_job_request *req, *tmp, *found;

	struct pkg_job_request_item *it;

	struct pkg_job_universe_item *un;
@@ -884,7 +884,7 @@ pkg_jobs_find_upgrade(struct pkg_jobs *j, const char *pattern, match_t m)
{

	struct pkg *p = NULL;

	struct pkgdb_it *it;
- 
	bool force = false, found = false;
+ 
	bool found = false;

	int rc = EPKG_FATAL;

	struct pkg_dep *rdep = NULL;

	unsigned flags = PKG_LOAD_BASIC|PKG_LOAD_OPTIONS|PKG_LOAD_DEPS|
@@ -892,9 +892,6 @@ pkg_jobs_find_upgrade(struct pkg_jobs *j, const char *pattern, match_t m)
			PKG_LOAD_ANNOTATIONS|PKG_LOAD_CONFLICTS;

	struct pkg_job_universe_item *unit = NULL;
- 
	if (j->flags & PKG_FLAG_FORCE)
- 
		force = true;
- 


	if ((it = pkgdb_repo_query(j->db, pattern, m, j->reponame)) == NULL)

		rc = EPKG_FATAL;