ce7eb76 version can also be an integer — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

version can also be an integer

Baptiste Daroussin committed 12 years ago

commit ce7eb7630480e331d88f9e2fc9032caeba98f06d
parent 027d098

2 files changed +6 -2

modified libpkg/pkg_manifest.c

@@ -110,6 +110,7 @@ static struct manifest_key {

 	{ "users",               PKG_USERS,               UCL_OBJECT, pkg_object},
 	{ "users",               PKG_USERS,               UCL_ARRAY,  pkg_array},
 	{ "version",             PKG_VERSION,             UCL_STRING, pkg_string},
 	{ "version",             PKG_VERSION,             UCL_INT,    pkg_int},
 	{ "www",                 PKG_WWW,                 UCL_STRING, pkg_string},
 	{ NULL, -99, -99, NULL}
 };

@@ -294,6 +295,11 @@ pkg_string(struct pkg *pkg, ucl_object_t *obj, int attr)

 static int
 pkg_int(struct pkg *pkg, ucl_object_t *obj, int attr)
 {
 	char vint[BUFSIZ];
 	if (attr == PKG_VERSION) {
 		snprintf(vint, sizeof(vint), "%"PRId64, obj->value.iv);
 		pkg_set(pkg, attr, vint);
 	}
 	return (pkg_set(pkg, attr, obj->value.iv));
 }

modified libpkg/update.c

@@ -745,8 +745,6 @@ cleanup:

 		pkg_free(pkg);
 	if (it != NULL)
 		pkgdb_it_free(it);
 	if (pkgdb_repo_close(sqlite, rc == EPKG_OK) != EPKG_OK)
 		rc = EPKG_FATAL;
 	if (map == MAP_FAILED && fmanifest)
 		fclose(fmanifest);
 	if (fdigests)