8d8e903 Ewwwww.... REGEXP uses the obsolete basic RE syntax, which doesn't have a ? operator (use \{0,1\} instead) and needs characters to be back-slashed to make them special. Horrid. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Ewwwww.... REGEXP uses the obsolete basic RE syntax, which doesn't have a ? operator (use \{0,1\} instead) and needs characters to be back-slashed to make them special. Horrid.

Matthew Seaman committed 13 years ago

commit 8d8e9035e83a74b118b3ed76ffd5b8650f7dd7ac
parent 4ac3ade

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 REGEXP '^ports-mgmt/pkg(-devel)?$';";
 	    "  WHERE p.origin REGEXP '^ports-mgmt/pkg\(-devel\)\{0,1\}$';";
 	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 REGEXP '^ports-mgmt/pkg(-devel)?$'");
 		 "WHERE origin REGEXP '^ports-mgmt/pkg\(-devel\)\{0,1\}$'");
 	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 REGEXP '^ports-mgmt/pkg(-devel)?$'");
 		 "WHERE origin REGEXP '^ports-mgmt/pkg\(-devel\)\{0,1\}$'");
 	sbuf_reset(sql);
 	sbuf_printf(sql, finalsql, reponame);