1c510ed Fix querying provide/requires — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix querying provide/requires

Baptiste Daroussin committed 11 years ago

commit 1c510ed7aa91c12be31b87250df1c3ef9c718902
parent 7dbe817

2 files changed +5 -6

modified libpkg/repo/binary/query.c

@@ -199,7 +199,7 @@ pkg_repo_binary_provide(struct pkg_repo *repo, const char *require)

 			"FROM packages AS p INNER JOIN pkg_provides AS ps ON "
 			"p.id = ps.package_id "
 			"WHERE ps.provide_id IN (SELECT id from provides WHERE "
 			"name BETWEEN ?1 AND ?1 || '.9');";
 			"provide = ?1 );";
 	sql = sbuf_new_auto();
 	sbuf_printf(sql, basesql, repo->name);

@@ -274,7 +274,7 @@ pkg_repo_binary_require(struct pkg_repo *repo, const char *provide)

 			"p.cksum, p.manifestdigest, p.path AS repopath, '%s' AS dbname "
 			"FROM packages AS p INNER JOIN pkg_requires AS ps ON "
 			"p.id = ps.package_id "
 			"WHERE ps.require_id = (SELECT id FROM requires WHERE name=?1);";
 			"WHERE ps.require_id = (SELECT id FROM requires WHERE require=?1);";
 	sql = sbuf_new_auto();
 	sbuf_printf(sql, basesql, repo->name);

modified tests/frontend/requires.shin

@@ -25,7 +25,7 @@ prefix: /usr/local

 desc: <<EOD
 Yet another test
 EOD
 provides: [a]
 provides: [a-1]
 EOF
 	cat << EOF > b.ucl

@@ -40,7 +40,7 @@ prefix: /usr/local

 desc: <<EOD
 Yet another test
 EOD
 requires: [a]
 requires: [a-1]
 EOF
 	for p in a b; do
 		atf_check \

@@ -56,7 +56,7 @@ EOF

 	    -s exit:0 \
 	    pkg repo .
 OUTPUT="Updating local1 repository catalogue...
 	OUTPUT="Updating local1 repository catalogue...
 ${JAILED}Fetching meta.txz... done
 ${JAILED}Fetching packagesite.txz... done
 Processing entries... done

@@ -68,7 +68,6 @@ New packages to be INSTALLED:

 	b: 1.0
 	a: 1.0
 "
 	atf_check \
 	    -o inline:"${OUTPUT}" \
 	    -e empty \