Add two pactest for versioned conflicts.

A side effect of the previous commit ( ea9a756eeaca7398c0860b55f8abe2932ad195bd )
is that it's now possible to use versioned conflicts.
Add two new conflict pactests for showing it.

Signed-off-by: Chantry Xavier <shiningxc@gmail.com>

1 files changed, 1 insertions, 9 deletions

diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c
index d52f7e12..1baa0c27 100644
--- a/lib/libalpm/conflict.c
+++ b/lib/libalpm/conflict.c
@@ -112,13 +112,6 @@ static void check_conflict(alpm_list_t *list1, alpm_list_t *list2,
 		for(j = alpm_pkg_get_conflicts(pkg1); j; j = j->next) {
 			const char *conflict = j->data;
 
-			if(strcmp(pkg1name, conflict) == 0) {
-				/* a package cannot conflict with itself -- that's just not nice */
-				_alpm_log(PM_LOG_DEBUG, "package '%s' conflicts with itself - packaging error",
-						pkg1name);
-				continue;
-			}
-
 			for(k = list2; k; k = k->next) {
 				pmpkg_t *pkg2 = k->data;
 				const char *pkg2name = alpm_pkg_get_name(pkg2);
@@ -140,8 +133,7 @@ static void check_conflict(alpm_list_t *list1, alpm_list_t *list2,
 	}
 }
 
-/* Returns a alpm_list_t* of pmdepmissing_t pointers.
- * conflicts are always name only */
+/* Returns a alpm_list_t* of pmdepmissing_t pointers. */
 alpm_list_t *_alpm_checkconflicts(pmdb_t *db, alpm_list_t *packages)
 {
 	alpm_list_t *baddeps = NULL;