From: Kristian Høgsberg <krh@redhat.com>
Date: Wed, 24 Oct 2007 16:21:29 +0000 (-0400)
Subject: Import rpm release as part of the version.
X-Git-Tag: 0.1~301
X-Git-Url: http://project.juiblex.co.uk/git/?a=commitdiff_plain;h=53d9c7fafb8a9528662196fcdff6f84a534f90a1;p=razor.git

Import rpm release as part of the version.
---

diff --git a/import.c b/import.c
index bdedb94..7af9621 100644
--- a/import.c
+++ b/import.c
@@ -318,8 +318,9 @@ razor_set_create_from_rpmdb(void)
 		headerGetEntry(h, RPMTAG_NAME, &type, &name.p, &count);
 		headerGetEntry(h, RPMTAG_VERSION, &type, &version.p, &count);
 		headerGetEntry(h, RPMTAG_RELEASE, &type, &release.p, &count);
-		razor_importer_begin_package(importer,
-					     name.string, version.string);
+		snprintf(filename, sizeof filename, "%s-%s",
+			 version.string, release.string);
+		razor_importer_begin_package(importer, name.string, filename);
 
 		headerGetEntry(h, RPMTAG_REQUIRENAME, &type,
 			       &property_names.p, &count);
diff --git a/razor.c b/razor.c
index b689533..ab64508 100644
--- a/razor.c
+++ b/razor.c
@@ -930,7 +930,7 @@ razor_set_list(struct razor_set *set, const char *pattern)
 		if (pattern && fnmatch(pattern, &pool[p->name], 0) != 0)
 		    continue;
 		if (with_version)
-			printf("%s %s\n", &pool[p->name], &pool[p->version]);
+			printf("%s-%s\n", &pool[p->name], &pool[p->version]);
 		else
 			printf("%s\n", &pool[p->name]);
 	}
@@ -997,7 +997,7 @@ razor_set_list_all_properties(struct razor_set *set, struct array *properties)
 	pool = set->string_pool.data;
 	end = properties->data + properties->size;
 	for (p = properties->data; p < end; p++)
-		printf("%s %s\n", &pool[p->name], &pool[p->version]);
+		printf("%s-%s\n", &pool[p->name], &pool[p->version]);
 }
 
 void
@@ -1016,7 +1016,7 @@ razor_set_list_requires(struct razor_set *set, const char *name)
 		pool = set->string_pool.data;
 		while (~*r) {
 			p = &requires[*r++];
-			printf("%s %s\n", &pool[p->name], &pool[p->version]);
+			printf("%s-%s\n", &pool[p->name], &pool[p->version]);
 		}
 	} else
 		razor_set_list_all_properties(set, &set->requires);
@@ -1038,7 +1038,7 @@ razor_set_list_provides(struct razor_set *set, const char *name)
 		pool = set->string_pool.data;
 		while (~*r) {
 			p = &provides[*r++];
-			printf("%s %s\n", &pool[p->name], &pool[p->version]);
+			printf("%s-%s\n", &pool[p->name], &pool[p->version]);
 		}
 	} else 
 		razor_set_list_all_properties(set, &set->provides);
@@ -1069,7 +1069,7 @@ razor_set_list_property_packages(struct razor_set *set,
 			set->package_pool.data + property->packages;
 		while (~*r) {
 			p = &packages[*r++];
-			printf("%s %s\n",
+			printf("%s-%s\n",
 			       &pool[p->name], &pool[p->version]);
 		}
 	next:
@@ -1175,7 +1175,7 @@ razor_set_list_file_packages(struct razor_set *set, const char *filename)
 	pool = set->string_pool.data;
 	while (~*r) {
 		p = &packages[*r++];
-		printf("%s %s\n", &pool[p->name], &pool[p->version]);
+		printf("%s-%s\n", &pool[p->name], &pool[p->version]);
 	}
 }
 
@@ -1304,7 +1304,7 @@ razor_set_list_unsatisfied(struct razor_set *set)
 
 	for (u = unsatisfied.data; u < end; u++) {
 		r = requires + *u;
-		printf("%s %s not satisfied\n",
+		printf("%s-%s not satisfied\n",
 		       &pool[r->name], &pool[r->version]);
 	}