87eb073 Only show the dirty conflicts list if debug is activated via pkg -d install... — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Only show the dirty conflicts list if debug is activated via pkg -d install...

Baptiste Daroussin committed 12 years ago

commit 87eb073b92491085b1ae8a40825b27824894da1c
parent 89dcc62

1 file changed +2 -1

modified pkg/event.c

@@ -63,7 +63,6 @@ event_callback(void *data, struct pkg_event *ev)

 {
 	struct pkg *pkg = NULL;
 	int *debug = data;
 	(void) debug;
 	const char *filename;
 	struct pkg_event_conflict *cur_conflict;

@@ -150,6 +149,8 @@ event_callback(void *data, struct pkg_event *ev)

 		printf(" done\n");
 		break;
 	case PKG_EVENT_INTEGRITYCHECK_CONFLICT:
 		if (*debug == 0)
 			break;
 		printf("\nConflict found on path %s between %s-%s(%s) and ",
 		    ev->e_integrity_conflict.pkg_path,
 		    ev->e_integrity_conflict.pkg_name,