c2368d3 Options should be ordered or 'pkg upgrade' will think all the options have changed. — HardenedBSD-pkg

HardenedBSD Package Manager

Options should be ordered or 'pkg upgrade' will think all the options have changed.

Matthew Seaman committed 12 years ago

commit c2368d35a23915fee60d7bb92a5b3639444ec6a2
parent a1a40436205cb0ad0a3cc0611aa321d69d3a386e

1 file changed +4 -4

modified libpkg/pkgdb.c

@@ -2111,21 +2111,21 @@ pkgdb_load_options(struct pkgdb *db, struct pkg *pkg)

 		{
 			"SELECT option, value "
 			"FROM %Q.option JOIN %Q.pkg_option USING(option_id) "
 			"WHERE package_id = ?1",
 			"WHERE package_id = ?1 ORDER BY option",
 			pkg_addoption,
 ,
 		},
 		{
 			"SELECT option, default_value "
 			"FROM %Q.option JOIN %Q.pkg_option_default USING(option_id) "
 			"WHERE package_id = ?1",
 			"WHERE package_id = ?1 ORDER BY option",
 			pkg_addoption_default,
 ,
 		},
 		{
 			"SELECT option, description "
 			"FROM %Q.option JOIN %Q.pkg_option_desc USING(option_id) "
 			"JOIN %Q.option_desc USING(option_desc_id)",
 			"JOIN %Q.option_desc USING(option_desc_id) ORDER BY option",
 			pkg_addoption_description,
 ,
 		}

@@ -2343,7 +2343,7 @@ static sql_prstmt sql_prepared_statements[PRSTMT_LAST] = {

 		NULL,
 		"INSERT INTO pkg_option(package_id, option_id, value) "
 		"VALUES (?1, "
 			"SELECT option_id FROM option WHERE option = ?2"
 			"(SELECT option_id FROM option WHERE option = ?2),"
 			"?3)",
 		"ITT",
 	},