|
 |
0b22ca7 |
diff -up pkg-config-0.22/pkg.c.conflicts pkg-config-0.22/pkg.c
|
|
|
0b22ca7 |
--- pkg-config-0.22/pkg.c.conflicts 2007-11-15 23:56:26.000000000 -0500
|
|
|
0b22ca7 |
+++ pkg-config-0.22/pkg.c 2007-11-15 23:57:26.000000000 -0500
|
|
|
0b22ca7 |
@@ -821,7 +821,7 @@ verify_package (Package *pkg)
|
|
|
0b22ca7 |
*/
|
|
|
0b22ca7 |
|
|
|
0b22ca7 |
recursive_fill_list (pkg, get_requires_private, &requires);
|
|
|
0b22ca7 |
- recursive_fill_list (pkg, get_conflicts, &conflicts);
|
|
|
0b22ca7 |
+ conflicts = get_conflicts (pkg);
|
|
|
0b22ca7 |
|
|
|
0b22ca7 |
requires_iter = requires;
|
|
|
0b22ca7 |
while (requires_iter != NULL)
|
|
|
0b22ca7 |
@@ -843,7 +843,7 @@ verify_package (Package *pkg)
|
|
|
0b22ca7 |
req->version, req->name,
|
|
|
0b22ca7 |
ver->name,
|
|
|
0b22ca7 |
comparison_to_str (ver->comparison),
|
|
|
0b22ca7 |
- ver->version,
|
|
|
0b22ca7 |
+ ver->version ? ver->version : "(any)",
|
|
|
0b22ca7 |
ver->owner->name,
|
|
|
0b22ca7 |
ver->owner->version);
|
|
|
0b22ca7 |
|
|
|
0b22ca7 |
@@ -857,7 +857,6 @@ verify_package (Package *pkg)
|
|
|
0b22ca7 |
}
|
|
|
0b22ca7 |
|
|
|
0b22ca7 |
g_slist_free (requires);
|
|
|
0b22ca7 |
- g_slist_free (conflicts);
|
|
|
0b22ca7 |
|
|
|
0b22ca7 |
/* We make a list of system directories that gcc expects so we can remove
|
|
|
0b22ca7 |
* them.
|