Radish alpha
H
HardenedBSD-pkg
HardenedBSD Package Manager
Radicle
Git (anonymous pull)
Log in to clone via SSH
Commits ›
Match both the standard ports-mgm/pkg port and the upcoming ports-mgm/pkg-devel port. The SQL JOIN condition at line 2611 of pkgdb.c means that only an origin matching what is already installed should be selected in that case.
Matthew Seaman committed 13 years ago
commit 4ac3ade283aede4472aa1c59bab17c963fc45575
parent 85ab789e83efef0f678ba8ff1b2a095160f8d03d
1 file changed +3 -3
modified libpkg/pkgdb.c
@@ -2609,7 +2609,7 @@ pkgdb_query_newpkgversion(struct pkgdb *db, const char *repo)
	    "COALESCE(l.flatsize, p.flatsize) as flatsize, "

	    "p.cksum, p.path, 0 FROM '%s'.packages as p "

	    "  LEFT JOIN packages as l ON p.origin = l.origin "
- 
	    "  WHERE p.origin = 'ports-mgmt/pkg';";
+ 
	    "  WHERE p.origin REGEXP '^ports-mgmt/pkg(-devel)?$';";



	assert(db != NULL);

	assert(db->type == PKGDB_REMOTE);
@@ -2850,7 +2850,7 @@ pkgdb_query_installs(struct pkgdb *db, match_t match, int nbpkgs, char **pkgs,
	sql_exec(db->sqlite, sbuf_get(sql));



	sql_exec(db->sqlite, "UPDATE pkgjobs SET weight=100000 "
- 
		 "WHERE origin=\"ports-mgmt/pkg\"");
+ 
		 "WHERE origin REGEXP '^ports-mgmt/pkg(-devel)?$'");



	sbuf_reset(sql);

	sbuf_printf(sql, finalsql, reponame);
@@ -3038,7 +3038,7 @@ pkgdb_query_upgrades(struct pkgdb *db, const char *repo, bool all)
	sql_exec(db->sqlite, sbuf_get(sql));



	sql_exec(db->sqlite, "UPDATE pkgjobs SET weight = 100000 "
- 
		 "WHERE origin = \"ports-mgmt/pkg\"");
+ 
		 "WHERE origin REGEXP '^ports-mgmt/pkg(-devel)?$'");



	sbuf_reset(sql);

	sbuf_printf(sql, finalsql, reponame);