Merge commit 'krh/master'
authorJames Bowes <jbowes@redhat.com>
Mon Jun 23 14:52:39 2008 -0400 (2008-06-23)
changeset 268fb5c3e1535ab
parent 264 634e54ca476c
parent 267 2464313cbced
child 269 03fc85294bc9
Merge commit 'krh/master'
     1.1 --- a/librazor/iterator.c	Mon Jun 23 14:51:56 2008 -0400
     1.2 +++ b/librazor/iterator.c	Mon Jun 23 14:52:39 2008 -0400
     1.3 @@ -248,7 +248,7 @@
     1.4  	else
     1.5  		index = NULL;
     1.6  
     1.7 -	for (i = 0, j = 0; i < pq->count; i++) {
     1.8 +	for (i = 0, j = 0; j < pq->count; i++) {
     1.9  		if (!pq->vector[i])
    1.10  			continue;
    1.11  
     2.1 --- a/src/Makefile.am	Mon Jun 23 14:51:56 2008 -0400
     2.2 +++ b/src/Makefile.am	Mon Jun 23 14:52:39 2008 -0400
     2.3 @@ -13,7 +13,8 @@
     2.4  	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
     2.5  	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\"
     2.6  
     2.7 -bin_PROGRAMS = razor rpm
     2.8 +bin_PROGRAMS = razor
     2.9 +noinst_PROGRAMS = rpm
    2.10  
    2.11  razor_SOURCES = main.c import-rpmdb.c import-yum.c
    2.12  razor_LDADD = $(RPM_LIBS) $(EXPAT_LIBS) $(CURL_LIBS) $(top_builddir)/librazor/librazor.la
     3.1 --- a/src/rpm.c	Mon Jun 23 14:51:56 2008 -0400
     3.2 +++ b/src/rpm.c	Mon Jun 23 14:52:39 2008 -0400
     3.3 @@ -396,9 +396,23 @@
     3.4  }
     3.5  
     3.6  static void
     3.7 -print_package_info(struct razor_set *set, struct razor_package *package)
     3.8 +print_package_info(struct razor_set *set, struct razor_package *package,
     3.9 +		   const char *name, const char *version, const char *arch)
    3.10  {
    3.11 -	printf("FIXME: Package info not tracked.\n");
    3.12 +	const char *summary, *description, *url, *license;
    3.13 +
    3.14 +	razor_package_get_details(set, package, &summary, &description,
    3.15 +				  &url, &license);
    3.16 +
    3.17 +	printf("Name:        %s\n", name);
    3.18 +	printf("Arch:        %s\n", arch);
    3.19 +	printf("Version:     %s\n", version);
    3.20 +	printf("URL:         %s\n", url);
    3.21 +	printf("License:     %s\n", license);
    3.22 +	printf("Summary:     %s\n", summary);
    3.23 +	printf("Description:\n");
    3.24 +	printf("%s\n", description);
    3.25 +	printf("\n");
    3.26  }
    3.27  
    3.28  static void
    3.29 @@ -435,7 +449,7 @@
    3.30  	struct razor_set *set;
    3.31  	struct razor_package_iterator *pi;
    3.32  	struct razor_package *package;
    3.33 -	const char *name, *version, *arch;
    3.34 +	const char *name, *version, *arch, *details;
    3.35  
    3.36  	if (option_package) {
    3.37  		set = create_set_from_command_line(argc, argv);
    3.38 @@ -447,6 +461,11 @@
    3.39  
    3.40  	pi = get_query_packages(set, argc, argv);
    3.41  
    3.42 +	/* FIXME: We need to figure out how to do this right. */
    3.43 +	details = "install/var/lib/razor/system-details.repo";
    3.44 +	if (option_info)
    3.45 +		razor_set_open_details(set, details);
    3.46 +
    3.47  	while (razor_package_iterator_next(pi, &package,
    3.48  					   &name, &version, &arch)) {
    3.49  		if (option_conflicts)
    3.50 @@ -462,7 +481,7 @@
    3.51  			print_package_properties(set, package,
    3.52  						 RAZOR_PROPERTY_PROVIDES);
    3.53  		if (option_info)
    3.54 -			print_package_info(set, package);
    3.55 +			print_package_info(set, package, name, version, arch);
    3.56  		if (option_changelog)
    3.57  			print_package_changelog(set, package);
    3.58