c1aadb4 Use new pkg_version_change() function — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Use new pkg_version_change() function

Matthew Seaman committed 12 years ago

commit c1aadb4fc6c75f7e61a4cd84de073dec5281f8b4
parent 3e85a7b

4 files changed +7 -10

modified libpkg/pkg_event.c

@@ -555,7 +555,7 @@ pkg_emit_upgrade_finished(struct pkg *p)

 		pkg_get(p, PKG_NAME, &name, PKG_OLD_VERSION, &version,
 		    PKG_VERSION, &newversion);
 		action = pkg_version_cmp(version, newversion) + 1;
 		action = pkg_version_change(pkg) + 1;
 		if (action >= 0 && action < num_actions)
 			syslog(LOG_NOTICE, "%s %s: %s -> %s ",
 			    name, actions[action], version, newversion);

modified libpkg/pkg_jobs.c

@@ -686,7 +686,7 @@ newer_than_local_pkg(struct pkg_jobs *j, struct pkg *rp, bool force)

 	}
 	/* compare versions */
 	cmp = pkg_version_cmp(newversion, oldversion);
 	cmp = pkg_version_change(rp);
 	if (cmp == 1) {
 		pkg_free(lp);

modified pkg/event.c

@@ -56,7 +56,6 @@ event_callback(void *data, struct pkg_event *ev)

 	struct pkg *pkg = NULL;
 	int *debug = data;
 	(void) debug;
 	const char *version, *newversion;
 	const char *filename;
 	struct pkg_event_conflict *cur_conflict;

@@ -209,9 +208,7 @@ event_callback(void *data, struct pkg_event *ev)

 			if (nbactions > 0)
 				sbuf_printf(msg, "[%d/%d] ", nbdone, nbactions);
 			pkg_get(pkg, PKG_VERSION, &newversion,
 			    PKG_OLD_VERSION, &version);
 			switch (pkg_version_cmp(version, newversion)) {
 			switch (pkg_version_change(pkg)) {
 			case 1:
 				pkg_sbuf_printf(msg,
 				    "Downgrading %n from %V to %v...",

modified pkg/utils.c

@@ -551,12 +551,12 @@ print_jobs_summary(struct pkg_jobs *jobs, const char *msg, ...)

 	dlsize = oldsize = newsize = 0;
 	flatsize = oldflatsize = pkgsize = 0;
 	version = oldversion = NULL;
 	oldversion = NULL;
 	pkg_config_string(PKG_CONFIG_CACHEDIR, &cachedir);
 	while (pkg_jobs(jobs, &pkg) == EPKG_OK) {
 		pkg_get(pkg, PKG_OLD_VERSION, &oldversion, PKG_VERSION, &version,
 		pkg_get(pkg, PKG_OLD_VERSION, &oldversion,
 		    PKG_FLATSIZE, &flatsize, PKG_OLD_FLATSIZE, &oldflatsize,
 		    PKG_PKGSIZE, &pkgsize, PKG_REASON, &why,
 		    PKG_REPONAME, &reponame);

@@ -569,7 +569,7 @@ print_jobs_summary(struct pkg_jobs *jobs, const char *msg, ...)

 				/* If it's a new install, then it
 				 * cannot have been locked yet. */
 				if (oldversion != NULL) {
 					switch(pkg_version_cmp(oldversion, version)) {
 					switch(pkg_version_change(pkg)) {
 					case -1:
 						pkg_printf("and may not be upgraded to version %v\n", pkg);
 						break;

@@ -610,7 +610,7 @@ print_jobs_summary(struct pkg_jobs *jobs, const char *msg, ...)

 				dlsize += pkgsize;
 			if (oldversion != NULL) {
 				switch (pkg_version_cmp(oldversion, version)) {
 				switch (pkg_version_change(pkg)) {
 				case 1:
 					pkg_printf("\tDowngrading %n: %V -> %v", pkg, pkg, pkg);
 					if (pkg_repos_count() > 1)