8fd57e2 Yet more debug informations — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Yet more debug informations

Baptiste Daroussin committed 12 years ago

commit 8fd57e2470bf2aa00b4bfc7177ea29fa915a2302
parent 0259283

2 files changed +7 -2

modified libpkg/pkg.c

@@ -579,6 +579,7 @@ pkg_adddep(struct pkg *pkg, const char *name, const char *origin, const char *ve

 	assert(origin != NULL && origin[0] != '\0');
 	assert(version != NULL && version[0] != '\0');
 	pkg_debug(3, "Pkg: add a new dependency origin: %s, name: %s, version: %s", origin, name, version);
 	HASH_FIND_STR(pkg->deps, __DECONST(char *, origin), d);
 	if (d != NULL) {
 		pkg_get(pkg, PKG_NAME, &n1, PKG_VERSION, &v1);

@@ -610,6 +611,7 @@ pkg_addrdep(struct pkg *pkg, const char *name, const char *origin, const char *v

 	assert(origin != NULL && origin[0] != '\0');
 	assert(version != NULL && version[0] != '\0');
 	pkg_debug(3, "Pkg: add a new reverse dependency origin: %s, name: %s, version: %s", origin, name, version);
 	pkg_dep_new(&d);
 	sbuf_set(&d->origin, origin);

@@ -637,6 +639,8 @@ pkg_addfile_attr(struct pkg *pkg, const char *path, const char *sha256, const ch

 	assert(pkg != NULL);
 	assert(path != NULL && path[0] != '\0');
 	pkg_debug(3, "Pkg: add new file '%s'", path);
 	if (check_duplicates) {
 		HASH_FIND_STR(pkg->files, __DECONST(char *, path), f);
 		if (f != NULL) {

@@ -703,6 +707,7 @@ pkg_adddir_attr(struct pkg *pkg, const char *path, const char *uname, const char

 	assert(pkg != NULL);
 	assert(path != NULL && path[0] != '\0');
 	pkg_debug(3, "Pkg: add new directory '%s'", path);
 	if (check_duplicates) {
 		HASH_FIND_STR(pkg->dirs, __DECONST(char *, path), d);
 		if (d != NULL) {

modified libpkg/pkg_manifest.c

@@ -333,7 +333,7 @@ parse_sequence(struct pkg * pkg, yaml_node_t *node, yaml_document_t *doc,

 	yaml_node_item_t *item;
 	yaml_node_t *val;
 	pkg_debug(3, "%s", "Parsing sequence");
 	pkg_debug(3, "%s", "Manifest: parsing sequence");
 	item = node->data.sequence.items.start;
 	while (item < node->data.sequence.items.top) {
 		val = yaml_document_get_node(doc, *item);

@@ -427,7 +427,7 @@ parse_mapping(struct pkg *pkg, yaml_node_t *item, yaml_document_t *doc, int attr

 	pair = item->data.mapping.pairs.start;
 	pkg_debug(3, "%s", "Parsing mapping");
 	pkg_debug(3, "%s", "Manifest: parsing mapping");
 	while (pair < item->data.mapping.pairs.top) {
 		key = yaml_document_get_node(doc, pair->key);
 		val = yaml_document_get_node(doc, pair->value);