6eb89c6 Speed up the upgrade — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Speed up the upgrade

Baptiste Daroussin committed 14 years ago

commit 6eb89c61ffe524043bc8016feb4014aac34b45ad
parent ea2925a

2 files changed +8 -1

modified libpkg/pkg_jobs.c

@@ -205,6 +205,13 @@ pkg_jobs_install(struct pkg_jobs *j)

 		pkg_get(p, PKG_ORIGIN, &pkgorigin, PKG_REPOPATH, &pkgrepopath,
 		    PKG_NEWVERSION, &newversion, PKG_AUTOMATIC, &automatic);
 		if (newversion != NULL) {
 				STAILQ_INSERT_TAIL(&pkg_queue, p, next);
 				pkg_script_run(p, PKG_SCRIPT_PRE_DEINSTALL);
 				pkg_get(pkg, PKG_ORIGIN, &origin);
 				pkgdb_unregister_pkg(j->db, origin);
 		}
 		it = pkgdb_integrity_conflict_local(j->db, pkgorigin);
 		if (it != NULL) {

modified libpkg/pkgdb.c

@@ -2681,7 +2681,7 @@ pkgdb_integrity_conflict_local(struct pkgdb *db, const char *origin)

        const char sql_conflicts [] = "SELECT DISTINCT p.id as rowid, p.origin, p.name, p.version, p.prefix "
                "FROM packages AS p, files AS f, integritycheck AS i "
                "WHERE (p.id = f.package_id AND f.path = i.path AND i.origin = ?1) OR p.origin = ?1";
                "WHERE p.id = f.package_id AND f.path = i.path AND i.origin = ?1";
        if (sqlite3_prepare_v2(db->sqlite, sql_conflicts, -1, &stmt, NULL) != SQLITE_OK) {
                ERROR_SQLITE(db->sqlite);