Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 3cf625f
Place remove jobs before installing.
Vsevolod Stakhov committed 12 years ago
commit 3cf625ff01e5f52edb56529eb062481a395d19cf
parent 761bf91
1 file changed +10 -0
modified libpkg/pkg_jobs.c
@@ -433,11 +433,21 @@ pkg_jobs_set_request_priority(struct pkg_jobs *j, struct pkg_solved *req)
			pkg_jobs_update_universe_priority(j, req->items[0], 0,

					PKG_PRIORITY_UPDATE_REQUEST);

	}
+
+ 
	return (EPKG_OK);

}



static int

pkg_jobs_sort_priority(struct pkg_solved *r1, struct pkg_solved *r2)

{
+ 
	if (r1->items[0]->priority == r2->items[0]->priority) {
+ 
		if (r1->type == PKG_SOLVED_DELETE && r2->type != PKG_SOLVED_DELETE)
+ 
			return (-1);
+ 
		else if (r2->type == PKG_SOLVED_DELETE && r1->type != PKG_SOLVED_DELETE)
+ 
			return (1);
+
+ 
		return (0);
+ 
	}

	return (r2->items[0]->priority - r1->items[0]->priority);

}