Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 6e6b962
Fix remote flatsize calculation + remove row sqlite from repos
Baptiste Daroussin committed 14 years ago
commit 6e6b9624f809239575a0f5c99039819c47613c2b
parent a35a0cb
2 files changed +4 -3
modified libpkg/pkg_repo.c
@@ -516,6 +516,7 @@ pkg_finish_repo(char *path, pem_password_cb *password_cb, char *rsa_key_path)
		ERR_free_strings();

	}

	packing_append_file(pack, repo_path, "repo.sqlite");
+ 
	unlink(repo_path);

	packing_finish(pack);



	return (EPKG_OK);
modified libpkg/pkgdb.c
@@ -1711,7 +1711,7 @@ pkgdb_query_upgrades(struct pkgdb *db)
	const char sql[] = ""

		"SELECT l.id AS rowid, l.origin AS origin, l.name AS name, l.version AS version, l.comment AS comment, l.desc AS desc, "

		"l.message AS message, l.arch AS arch, l.osversion AS osversion, l.maintainer AS maintainer, "
- 
		"l.www AS www, l.prefix AS prefix, l.flatsize AS flatsize, r.version AS newversion, r.flatsize AS flatsize, "
+ 
		"l.www AS www, l.prefix AS prefix, l.flatsize AS flatsize, r.version AS newversion, r.flatsize AS newflatsize, "

		"r.pkgsize AS pkgsize, r.path AS repopath "

		"FROM main.packages AS l, "

		"remote.packages AS r "
@@ -1739,7 +1739,7 @@ pkgdb_query_downgrades(struct pkgdb *db)
	const char sql[] = ""

		"SELECT l.id AS rowid, l.origin AS origin, l.name AS name, l.version AS version, l.comment AS comment, l.desc AS desc, "

		"l.message AS message, l.arch AS arch, l.osversion AS osversion, l.maintainer AS maintainer, "
- 
		"l.www AS www, l.prefix AS prefix, l.flatsize AS flatsize, r.version AS version, r.flatsize AS flatsize, "
+ 
		"l.www AS www, l.prefix AS prefix, l.flatsize AS flatsize, r.version AS version, r.flatsize AS newflatsize, "

		"r.pkgsize AS pkgsize, r.path AS repopath "

		"FROM main.packages AS l, "

		"remote.packages AS r "
@@ -1791,7 +1791,7 @@ pkgdb_rquery(struct pkgdb *db, const char *pattern, match_t match, pkgdb_field f


	sbuf_cat(sql, "SELECT origin, name, version, comment, "

			"desc, arch, arch, osversion, maintainer, www, "
- 
			"flatsize, pkgsize, cksum, path AS repopath FROM remote.packages");
+ 
			"flatsize AS newflatsize, pkgsize, cksum, path AS repopath FROM remote.packages");



	switch (match) {

		case MATCH_ALL: