74a7764 Fix pkg info -R — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix pkg info -R

Baptiste Daroussin committed 10 years ago

commit 74a7764d02e2a3bc644c30b5de7765d2af505ed2
parent 833b65e

2 files changed +6 -1

modified src/info.c

@@ -281,7 +281,7 @@ exec_info(int argc, char **argv)

 			opt |= INFO_FULL;
 		pkg_manifest_keys_new(&keys);
 		if (opt & INFO_RAW) {
 			if ((opt & (INFO_RAW_JSON|INFO_RAW_JSON_COMPACT)) == 0)
 			if ((opt & (INFO_RAW_JSON|INFO_RAW_JSON_COMPACT|INFO_RAW_UCL)) == 0)
 				opt |= INFO_RAW_YAML;
 		}

modified src/utils.c

@@ -328,7 +328,12 @@ print_info(struct pkg * const pkg, uint64_t options)

 			break;
 		case INFO_RAW_JSON:
 			outflags |= PKG_MANIFEST_EMIT_JSON;
 			break;
 		case INFO_RAW_JSON_COMPACT:
 			outflags |= PKG_MANIFEST_EMIT_COMPACT;
 			break;
 		default:
 			printf("grmbl\n");
 			break;
 		}
 		if (pkg_type(pkg) == PKG_REMOTE)