Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 45777b5
Fix keeping automatic flags on install/upgrade
Baptiste Daroussin committed 13 years ago
commit 45777b5ec66b4d5d59166606c6a8f28085ac46a4
parent b26f5c8
1 file changed +3 -3
modified libpkg/pkgdb.c
@@ -2441,7 +2441,7 @@ pkgdb_query_installs(struct pkgdb *db, match_t match, int nbpkgs, char **pkgs, c
			"cksum, repopath, automatic) "

			"SELECT l.id, l.origin, l.name, l.version, l.comment, l.desc, l.message, l.arch, "

			"l.maintainer, l.www, l.prefix, l.flatsize, r.version AS newversion, "
- 
			"r.flatsize AS newflatsize, r.pkgsize, r.cksum, r.repopath, r.automatic "
+ 
			"r.flatsize AS newflatsize, r.pkgsize, r.cksum, r.repopath, l.automatic "

			"FROM main.packages AS l, pkgjobs AS r WHERE l.origin = r.origin ");



	sbuf_reset(sql);
@@ -2514,7 +2514,7 @@ pkgdb_query_upgrades(struct pkgdb *db, const char *repo, bool all)
			"cksum, repopath, automatic) "

			"SELECT l.id, l.origin, l.name, l.version, l.comment, l.desc, l.message, l.arch, "

			"l.maintainer, l.www, l.prefix, l.flatsize, r.version AS newversion, "
- 
			"r.flatsize AS newflatsize, r.pkgsize, r.cksum, r.repopath, r.automatic "
+ 
			"r.flatsize AS newflatsize, r.pkgsize, r.cksum, r.repopath, l.automatic "

			"FROM main.packages AS l, pkgjobs AS r WHERE l.origin = r.origin "

			"AND (PKGLT(l.version, r.version) OR (l.name != r.name))";

	} else {
@@ -2523,7 +2523,7 @@ pkgdb_query_upgrades(struct pkgdb *db, const char *repo, bool all)
			"cksum, repopath, automatic) "

			"SELECT l.id, l.origin, l.name, l.version, l.comment, l.desc, l.message, l.arch, "

			"l.maintainer, l.www, l.prefix, l.flatsize, r.version AS newversion, "
- 
			"r.flatsize AS newflatsize, r.pkgsize, r.cksum, r.repopath, r.automatic "
+ 
			"r.flatsize AS newflatsize, r.pkgsize, r.cksum, r.repopath, l.automatic "

			"FROM main.packages AS l, pkgjobs AS r WHERE l.origin = r.origin";

	}