e7c65cb Uniqueness has been changed from origin to name make the dependency unicity check follow — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Uniqueness has been changed from origin to name make the dependency unicity check follow

Baptiste Daroussin committed 11 years ago

commit e7c65cb05f50832ff1c7d5efe903839a3327a712
parent d2be71a

2 files changed +6 -2

modified libpkg/pkgdb.c

@@ -73,7 +73,7 @@

 */
 #define DB_SCHEMA_MAJOR	0
 #define DB_SCHEMA_MINOR	29
 #define DB_SCHEMA_MINOR	30
 #define DBVERSION (DB_SCHEMA_MAJOR * 1000 + DB_SCHEMA_MINOR)

@@ -386,7 +386,7 @@ pkgdb_init(sqlite3 *sdb)

 		"package_id INTEGER REFERENCES packages(id) ON DELETE CASCADE"
 			" ON UPDATE CASCADE"
 	");"
 	"CREATE UNIQUE INDEX deps_unique ON deps(origin, version, package_id);"
 	"CREATE UNIQUE INDEX deps_unique ON deps(name, version, package_id);"
 	"CREATE TABLE files ("
 		"path TEXT PRIMARY KEY,"
 		"sha256 TEXT,"

modified libpkg/private/db_upgrades.h

@@ -647,6 +647,10 @@ static struct db_upgrades {

 	"DROP INDEX packages_unique;"
 	"CREATE UNIQUE INDEX packages_unique ON packages(name);"
 	},
 	{30,
 	"DROP INDEX deps_unique;"
 	"CREATE UNIQUE INDEX deps_unique ON deps(name, version, package_id);"
 	},
 	/* Mark the end of the array */
 	{ -1, NULL }