1.1 --- a/src/rpm.c	Fri Jun 20 16:48:44 2008 -0400
     1.2 +++ b/src/rpm.c	Fri Jun 20 22:26:41 2008 -0400
     1.3 @@ -507,12 +507,17 @@
     1.4  }
     1.5  
     1.6  static void
     1.7 -remove_package(const char *name,
     1.8 -	       const char *old_version, const char *new_version,
     1.9 -	       const char *arch, void *data)
    1.10 +update_package(enum razor_diff_action action,
    1.11 +	       struct razor_package *package,
    1.12 +	       const char *name,
    1.13 +	       const char *version,
    1.14 +	       const char *arch,
    1.15 +	       void *data)
    1.16  {
    1.17 -	if (old_version)
    1.18 -		printf("remove %s-%s.%s\n", name, old_version, arch);
    1.19 +	if (action == RAZOR_DIFF_ACTION_ADD)
    1.20 +		printf("install %s-%s.%s\n", name, version, arch);
    1.21 +	if (action == RAZOR_DIFF_ACTION_REMOVE)
    1.22 +		printf("remove %s-%s.%s\n", name, version, arch);
    1.23  }
    1.24  
    1.25  static void
    1.26 @@ -555,7 +560,7 @@
    1.27  	next = razor_transaction_finish(trans);
    1.28  
    1.29  	if (!option_justdb)
    1.30 -		razor_set_diff(set, next, remove_package, NULL);
    1.31 +		razor_set_diff(set, next, update_package, NULL);
    1.32  
    1.33  	razor_set_destroy(set);
    1.34  	razor_set_destroy(upstream);
    1.35 @@ -564,15 +569,6 @@
    1.36  }
    1.37  
    1.38  static void
    1.39 -install_package(const char *name,
    1.40 -		const char *old_version, const char *new_version,
    1.41 -		const char *arch, void *data)
    1.42 -{
    1.43 -	if (new_version)
    1.44 -		printf("install %s-%s.%s\n", name, new_version, arch);
    1.45 -}
    1.46 -
    1.47 -static void
    1.48  command_install(int argc, const char *argv[])
    1.49  {
    1.50  	struct razor_set *set, *upstream, *next;
    1.51 @@ -608,7 +604,7 @@
    1.52  	next = razor_transaction_finish(trans);
    1.53  
    1.54  	if (!option_justdb)
    1.55 -		razor_set_diff(set, next, install_package, NULL);
    1.56 +		razor_set_diff(set, next, update_package, NULL);
    1.57  
    1.58  	razor_set_destroy(set);
    1.59  	razor_set_destroy(upstream);
    1.60 @@ -617,17 +613,6 @@
    1.61  }
    1.62  
    1.63  static void
    1.64 -update_package(const char *name,
    1.65 -	       const char *old_version, const char *new_version,
    1.66 -	       const char *arch, void *data)
    1.67 -{
    1.68 -	if (old_version)
    1.69 -		printf("remove %s-%s.%s\n", name, old_version, arch);
    1.70 -	if (new_version)
    1.71 -		printf("install %s-%s.%s\n", name, new_version, arch);
    1.72 -}
    1.73 -
    1.74 -static void
    1.75  command_update(int argc, const char *argv[])
    1.76  {
    1.77  	struct razor_set *set, *upstream, *next;