7587b26 By default produced inlined yaml — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

By default produced inlined yaml

Baptiste Daroussin committed 12 years ago

commit 7587b268e1a90be39bc51d8408e067e0e0ddefea
parent cfa340d

3 files changed +8 -3

modified libpkg/pkg.h.in

@@ -813,6 +813,7 @@ void pkg_manifest_parser_free(struct pkg_manifest_parser *p);

 #define PKG_MANIFEST_EMIT_COMPACT 0x1
 #define PKG_MANIFEST_EMIT_NOFILES (0x1 << 1)
 #define PKG_MANIFEST_EMIT_PRETTY (0x1 << 2)
 /**
  * Emit a manifest according to the attributes of pkg.

modified libpkg/pkg_manifest.c

@@ -1513,6 +1513,7 @@ emit_manifest(struct pkg *pkg, yaml_emitter_t *emitter, short flags)

 	const char *script_types = NULL;
 	lic_t licenselogic;
 	int64_t flatsize, pkgsize;
 	yaml_mapping_style_t manifest_mapping = YAML_FLOW_MAPPING_STYLE;
 #define manifest_append_map(id, map, key, block) do {			\
 	int scalar_obj = YAML_ADD_SCALAR(&doc, key, PLAIN);		\

@@ -1520,9 +1521,12 @@ emit_manifest(struct pkg *pkg, yaml_emitter_t *emitter, short flags)

 	yaml_document_append_mapping_pair(&doc, map, scalar_obj, id);	\
 } while (0)
 	if ((flags & PKG_MANIFEST_EMIT_PRETTY) == PKG_MANIFEST_EMIT_PRETTY)
 		manifest_mapping = YAML_BLOCK_MAPPING_STYLE;
 	yaml_document_initialize(&doc, NULL, NULL, NULL, 0, 1);
 	mapping = yaml_document_add_mapping(&doc, NULL,
 	    YAML_BLOCK_MAPPING_STYLE);
 	    manifest_mapping);
 	pkg_get(pkg, PKG_NAME, &name, PKG_ORIGIN, &pkgorigin,
 	    PKG_COMMENT, &comment, PKG_ARCH, &pkgarch, PKG_WWW, &www,

modified pkg/utils.c

@@ -244,9 +244,9 @@ print_info(struct pkg * const pkg, unsigned int options)

 	if (options & INFO_RAW) {
 		if (pkg_type(pkg) != PKG_REMOTE)
 			pkg_emit_manifest_file(pkg, stdout, 0, NULL);
 			pkg_emit_manifest_file(pkg, stdout, PKG_MANIFEST_EMIT_PRETTY, NULL);
 		else
 			pkg_emit_manifest_file(pkg, stdout, PKG_MANIFEST_EMIT_COMPACT, NULL);
 			pkg_emit_manifest_file(pkg, stdout, PKG_MANIFEST_EMIT_COMPACT|PKG_MANIFEST_EMIT_PRETTY, NULL);
 		return;
 	}