Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 52f7509
Only propose the necessary in pkg -vv output
Baptiste Daroussin committed 12 years ago
commit 52f75091c35f33e8913106fbf2db6169db315031
parent f6b8b27
1 file changed +15 -9
modified pkg/main.c
@@ -442,17 +442,23 @@ show_repository_info(void)
			break;

		}
- 
		printf("  %s: { \n    %-16s: %s,\n    %-16s: %s,\n    %-16s: %s,\n"
- 
		    "    %-16s: %s,\n    %-16s: %s,\n    %-16s: %s\n  } \n",
+ 
		printf("  %s: { \n    %-16s: %s,\n    %-16s: %s",

		    pkg_repo_ident(repo),

                    "url", pkg_repo_url(repo),
- 
		    "signature_type", sig,
- 
		    "pubkey", pkg_repo_key(repo) == NULL ?
- 
		        "" : pkg_repo_key(repo),
- 
		    "fingerprints", pkg_repo_fingerprints(repo) == NULL ?
- 
		        "" : pkg_repo_fingerprints(repo),
- 
		    "enabled", pkg_repo_enabled(repo) ? "yes" : "no",
- 
		    "mirror_type", mirror);
+ 
		    "enabled", pkg_repo_enabled(repo) ? "yes" : "no");
+ 
		if (pkg_repo_mirror_type(repo) != NOMIRROR)
+ 
			printf(",\n    %-16s: %s",
+ 
			    "mirror_type", mirror);
+ 
		if (pkg_repo_signature_type(repo) != SIG_NONE)
+ 
			printf(",\n    %-16s: %s",
+ 
			    "signature_type", sig);
+ 
		if (pkg_repo_fingerprints(repo) != NULL)
+ 
			printf(",\n    %-16s: %s",
+ 
			    "fingerprints", pkg_repo_fingerprints(repo));
+ 
		if (pkg_repo_key(repo) != NULL)
+ 
			printf(",\n    %-16s: %s",
+ 
			    "pubkey", pkg_repo_key(repo));
+ 
		printf("\n  }\n");

	}

}