1.1 --- a/main.c	Sun Apr 06 19:24:07 2008 -0400
     1.2 +++ b/main.c	Sun Apr 06 23:35:46 2008 -0400
     1.3 @@ -25,7 +25,7 @@
     1.4  	struct razor_set *set;
     1.5  	struct razor_package_iterator *pi;
     1.6  	struct razor_package *package;
     1.7 -	const char *pattern, *name, *version;
     1.8 +	const char *pattern, *name, *version, *arch;
     1.9  	int only_names = 0, i = 0;
    1.10  
    1.11  	if (strcmp(argv[i], "--only-names") == 0) {
    1.12 @@ -36,14 +36,15 @@
    1.13  	pattern = argv[i];
    1.14  	set = razor_set_open(repo_filename);
    1.15  	pi = razor_package_iterator_create(set);
    1.16 -	while (razor_package_iterator_next(pi, &package, &name, &version)) {
    1.17 +	while (razor_package_iterator_next(pi, &package,
    1.18 +					   &name, &version, &arch)) {
    1.19  		if (pattern && fnmatch(pattern, name, 0) != 0)
    1.20  			continue;
    1.21  
    1.22  		if (only_names)
    1.23  			printf("%s\n", name);
    1.24  		else
    1.25 -			printf("%s-%s\n", name, version);
    1.26 +			printf("%s-%s.%s\n", name, version, arch);
    1.27  	}
    1.28  	razor_package_iterator_destroy(pi);
    1.29  	razor_set_destroy(set);
    1.30 @@ -132,14 +133,15 @@
    1.31  	struct razor_set *set;
    1.32  	struct razor_package_iterator *pi;
    1.33  	struct razor_package *package;
    1.34 -	const char *name, *version;
    1.35 +	const char *name, *version, *arch;
    1.36  
    1.37  	set = razor_set_open(repo_filename);
    1.38  	if (set == NULL)
    1.39  		return 1;
    1.40  
    1.41  	pi = razor_package_iterator_create_for_file(set, argv[0]);
    1.42 -	while (razor_package_iterator_next(pi, &package, &name, &version))
    1.43 +	while (razor_package_iterator_next(pi, &package,
    1.44 +					   &name, &version, &arch))
    1.45  		printf("%s-%s\n", name, version);
    1.46  	razor_package_iterator_destroy(pi);
    1.47  
    1.48 @@ -168,11 +170,12 @@
    1.49  {
    1.50  	struct razor_package_iterator *pi;
    1.51  	struct razor_package *package;
    1.52 -	const char *name, *version;
    1.53 +	const char *name, *version, *arch;
    1.54  
    1.55  	pi = razor_package_iterator_create_for_property(set, property);
    1.56 -	while (razor_package_iterator_next(pi, &package, &name, &version))
    1.57 -		printf("%s-%s\n", name, version);
    1.58 +	while (razor_package_iterator_next(pi, &package,
    1.59 +					   &name, &version, &arch))
    1.60 +		printf("%s-%s.%s\n", name, version, arch);
    1.61  	razor_package_iterator_destroy(pi);
    1.62  }
    1.63  
    1.64 @@ -385,7 +388,8 @@
    1.65  
    1.66  static void
    1.67  print_diff(const char *name,
    1.68 -	   const char *old_version, const char *new_version, void *data)
    1.69 +	   const char *old_version, const char *new_version, const char *arch,
    1.70 +	   void *data)
    1.71  {
    1.72  	if (old_version)
    1.73  		printf("removing %s %s\n", name, old_version);
    1.74 @@ -499,14 +503,15 @@
    1.75  {
    1.76  	struct razor_package_iterator *pi;
    1.77  	struct razor_package *package;
    1.78 -	const char *name, *version;
    1.79 +	const char *name, *version, *arch;
    1.80  	char **packages;
    1.81  	int i;
    1.82  
    1.83  	packages = malloc(count * sizeof *packages);
    1.84  	pi = razor_package_iterator_create(set);
    1.85  	i = 0;
    1.86 -	while (razor_package_iterator_next(pi, &package, &name, &version))
    1.87 +	while (razor_package_iterator_next(pi, &package,
    1.88 +					   &name, &version, &arch))
    1.89  		packages[i++] = strdup(name);
    1.90  	razor_package_iterator_destroy(pi);
    1.91  
    1.92 @@ -629,7 +634,7 @@
    1.93  	struct razor_set *set;
    1.94  	struct razor_package_iterator *pi;
    1.95  	struct razor_package *package;
    1.96 -	const char *pattern = argv[0], *name, *version;
    1.97 +	const char *pattern = argv[0], *name, *version, *arch;
    1.98  	char url[256], file[256];
    1.99  	CURL *curl;
   1.100  
   1.101 @@ -639,7 +644,8 @@
   1.102  
   1.103  	set = razor_set_open(rawhide_repo_filename);
   1.104  	pi = razor_package_iterator_create(set);
   1.105 -	while (razor_package_iterator_next(pi, &package, &name, &version)) {
   1.106 +	while (razor_package_iterator_next(pi, &package,
   1.107 +					   &name, &version, &arch)) {
   1.108  		if (pattern && fnmatch(pattern, name, 0) != 0)
   1.109  			continue;
   1.110