ccb9bb7 Simplify the options comparison request — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Simplify the options comparison request

Baptiste Daroussin committed 13 years ago

commit ccb9bb768689c43f3de3e8e5d55d7c8746d85391
parent a51badc

1 file changed +6 -6

modified libpkg/pkgdb.c

@@ -2135,8 +2135,8 @@ report_already_installed(sqlite3 *s)

 	const char *sql = "SELECT origin FROM pkgjobs WHERE "
 		"(SELECT p.origin FROM main.packages AS p WHERE "
 		"p.origin=pkgjobs.origin AND p.version=pkgjobs.version "
 		"AND (((SELECT group_concat(option) FROM (select option FROM main.options WHERE package_id=p.id AND value='on' ORDER BY option)) IS NULL "
 		"AND pkgjobs.opts IS NULL) OR (SELECT group_concat(option) FROM (select option FROM main.options WHERE package_id=p.id AND value='on' ORDER BY option)) == pkgjobs.opts)) IS NOT NULL;";
 		"AND (SELECT group_concat(option) FROM (select option FROM main.options WHERE package_id=p.id AND value='on' ORDER BY option)) IS pkgjobs.opts) "
 		"IS NOT NULL;";
 	assert(s != NULL);

@@ -2448,8 +2448,8 @@ pkgdb_query_installs(struct pkgdb *db, match_t match, int nbpkgs, char **pkgs, c

 		sql_exec(db->sqlite, "DELETE FROM pkgjobs WHERE "
 		    "(SELECT p.origin FROM main.packages AS p WHERE "
 		    "p.origin=pkgjobs.origin AND PKGLE(p.version,pkgjobs.version) AND p.name = pkgjobs.name "
 		    "AND ( ((SELECT group_concat(option) FROM (select option FROM main.options WHERE package_id=p.id AND value='on' ORDER BY option)) IS NULL "
 		    "AND pkgjobs.opts IS NULL) OR (SELECT group_concat(option) FROM (select option FROM main.options WHERE package_id=p.id AND value='on' ORDER BY option)) == pkgjobs.opts)) IS NOT NULL;");
 		    "AND (SELECT group_concat(option) FROM (select option FROM main.options WHERE package_id=p.id AND value='on' ORDER BY option)) IS pkgjobs.opts) "
 		    "IS NOT NULL;");
 	}
 	/* Append dependencies */

@@ -2579,8 +2579,8 @@ pkgdb_query_upgrades(struct pkgdb *db, const char *repo, bool all)

 		sql_exec(db->sqlite, "DELETE FROM pkgjobs WHERE "
 		    "(SELECT p.origin FROM main.packages AS p WHERE "
 		    "p.origin=pkgjobs.origin AND PKGLE(p.version,pkgjobs.version) AND p.name = pkgjobs.name "
 		    "AND ( ((SELECT group_concat(option) FROM (select option FROM main.options WHERE package_id=p.id AND value='on' ORDER BY option)) IS NULL "
 		    "AND pkgjobs.opts IS NULL) OR (SELECT group_concat(option) FROM (select option FROM main.options WHERE package_id=p.id AND value='on' ORDER BY option)) == pkgjobs.opts)) IS NOT NULL;");
 		    "AND (SELECT group_concat(option) FROM (select option FROM main.options WHERE package_id=p.id AND value='on' ORDER BY option)) IS pkgjobs.opts) "
 		    "IS NOT NULL;");
 	}
 	sbuf_reset(sql);