Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Fix reinstall due to changed options not retaining automatic flag
Bryan Drewery committed 13 years ago
commit 261605c5eeb3b65c51f109a7016fec325abffe8e
parent a7fe3b3
1 file changed +5 -5
modified libpkg/pkgdb.c
@@ -2693,11 +2693,11 @@ pkgdb_query_upgrades(struct pkgdb *db, const char *repo, bool all)
	const char pkgjobs_sql_1[] = "INSERT OR IGNORE INTO pkgjobs (pkgid, origin, name, version, comment, desc, arch, "
			"maintainer, www, prefix, flatsize, newversion, pkgsize, "
			"cksum, repopath, automatic, opts) "
-
			"SELECT id, origin, name, version, comment, desc, "
-
			"arch, maintainer, www, prefix, flatsize, version AS newversion, pkgsize, "
-
			"cksum, path, 0 ,"
-
			"(select group_concat(option) from (select option from '%s'.options WHERE package_id=id AND value='on' ORDER BY option)) "
-
			"FROM '%s'.packages WHERE origin IN (select origin from main.packages)";
+
			"SELECT r.id, r.origin, r.name, r.version, r.comment, r.desc, "
+
			"r.arch, r.maintainer, r.www, r.prefix, r.flatsize, r.version AS newversion, r.pkgsize, "
+
			"r.cksum, r.path, l.automatic ,"
+
			"(select group_concat(option) from (select option from '%s'.options WHERE package_id=r.id AND value='on' ORDER BY option)) "
+
			"FROM '%s'.packages r INNER JOIN main.packages l ON l.origin = r.origin";

	const char pkgjobs_sql_2[] = "INSERT OR IGNORE INTO pkgjobs (pkgid, origin, name, version, comment, desc, arch, "
				"maintainer, www, prefix, flatsize, newversion, pkgsize, "