print conflict problems differently then missing dependencies

CVS patchset: 1110
CVS date: 1996/10/20 19:29:34

1 files changed, 7 insertions, 2 deletions

diff --git a/install.c b/install.c
index 8b72282ae..abd6a60f2 100644
--- a/install.c
+++ b/install.c
@@ -409,7 +409,12 @@ static void printDepProblems(FILE * f, struct rpmDependencyConflict * conflicts,
 	    printDepFlags(stderr, conflicts[i].needsVersion, 
 			  conflicts[i].needsFlags);
 	}
-	fprintf(f, " is needed by %s-%s-%s\n", conflicts[i].byName, 
-		conflicts[i].byVersion, conflicts[i].byRelease);
+
+	if (conflicts[i].sense == RPMDEP_SENSE_REQUIRES) 
+	    fprintf(f, " is needed by %s-%s-%s\n", conflicts[i].byName, 
+		    conflicts[i].byVersion, conflicts[i].byRelease);
+	else
+	    fprintf(f, " conflicts with %s-%s-%s\n", conflicts[i].byName, 
+		    conflicts[i].byVersion, conflicts[i].byRelease);
     }
 }