1.1 --- a/src/rpm.c	Mon Jun 23 19:58:13 2008 -0400
     1.2 +++ b/src/rpm.c	Mon Jun 23 20:09:56 2008 -0400
     1.3 @@ -48,14 +48,14 @@
     1.4   * install and info), and then look at the relevent one depending on
     1.5   * what else in on the command line. */
     1.6  
     1.7 -static int option_all, option_whatrequires, option_whatprovides;
     1.8 +static int option_all, option_list, option_whatrequires, option_whatprovides;
     1.9  static int option_package;
    1.10  
    1.11  static const struct option query_options[] = {
    1.12  	{ OPTION_BOOL, "configfiles", 'c', NULL, "list all configuration files", NULL },
    1.13  	{ OPTION_BOOL, "docfiles", 'd', NULL, "list all documentation files", NULL },
    1.14  	{ OPTION_BOOL, "dump", 0, NULL, "dump basic file information", NULL },
    1.15 -	{ OPTION_BOOL, "list", 0, NULL, "list files in package", NULL },
    1.16 +	{ OPTION_BOOL, "list", 'l', NULL, "list files in package", &option_list },
    1.17  	{ OPTION_STRING, "queryformat", 0, "QUERYFORMAT", "use the following query format", NULL },
    1.18  	{ OPTION_BOOL, "state", 's', NULL, "display the states of the listed files", NULL },
    1.19  	{ OPTION_BOOL, "all", 'a', NULL, "query/verify all packages", &option_all },
    1.20 @@ -449,7 +449,7 @@
    1.21  	struct razor_set *set;
    1.22  	struct razor_package_iterator *pi;
    1.23  	struct razor_package *package;
    1.24 -	const char *name, *version, *arch, *details;
    1.25 +	const char *name, *version, *arch, *details, *files;
    1.26  
    1.27  	if (option_package) {
    1.28  		set = create_set_from_command_line(argc, argv);
    1.29 @@ -465,6 +465,9 @@
    1.30  	details = "install/var/lib/razor/system-details.repo";
    1.31  	if (option_info)
    1.32  		razor_set_open_details(set, details);
    1.33 +	files = "install/var/lib/razor/system-files.repo";
    1.34 +	if (option_list)
    1.35 +		razor_set_open_files(set, files);
    1.36  
    1.37  	while (razor_package_iterator_next(pi, &package,
    1.38  					   &name, &version, &arch)) {
    1.39 @@ -484,10 +487,12 @@
    1.40  			print_package_info(set, package, name, version, arch);
    1.41  		if (option_changelog)
    1.42  			print_package_changelog(set, package);
    1.43 +		if (option_list)
    1.44 +			razor_set_list_package_files(set, name);
    1.45  
    1.46  		if (option_conflicts + option_obsoletes +
    1.47  		    option_requires + option_provides +
    1.48 -		    option_info + option_changelog == 0)
    1.49 +		    option_info + option_changelog + option_list == 0)
    1.50  			printf("%s-%s.%s\n", name, version, arch);
    1.51  	}
    1.52