Date: Sunday, March 11, 2007 @ 21:25:41 Author: dan Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: query.c (1.28 -> 1.29) * Fixed -Qil regression, now both flags are honored. (FS #1355) ---------+ query.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) Index: pacman-lib/src/pacman/query.c diff -u pacman-lib/src/pacman/query.c:1.28 pacman-lib/src/pacman/query.c:1.29 --- pacman-lib/src/pacman/query.c:1.28 Tue Mar 6 17:06:28 2007 +++ pacman-lib/src/pacman/query.c Sun Mar 11 21:25:40 2007 @@ -189,8 +189,7 @@ return(1); } if(config->op_q_info) { - dump_pkg_full(info, 0); - MSG(NL, "\n"); + dump_pkg_full(info, config->op_q_info); } if(config->op_q_list) { dump_pkg_files(info); @@ -260,6 +259,16 @@ } /* find a target */ + if(config->op_q_info) { + dump_pkg_full(info, config->op_q_info); + } + if(config->op_q_list) { + dump_pkg_files(info); + } + if(!config->op_q_info && !config->op_q_list) { + MSG(NL, "%s %s\n", alpm_pkg_get_name(info), + alpm_pkg_get_version(info)); + } if(config->op_q_changelog) { char changelog[PATH_MAX]; snprintf(changelog, PATH_MAX, "%s%s/%s/%s-%s/changelog", @@ -268,16 +277,6 @@ alpm_pkg_get_name(info), alpm_pkg_get_version(info)); dump_pkg_changelog(changelog, alpm_pkg_get_name(info)); - } else if(config->op_q_info) { - dump_pkg_full(info, config->op_q_info); - } else if(config->op_q_list) { - dump_pkg_files(info); - } else if(config->op_q_orphans) { - if(alpm_pkg_get_requiredby(info) == NULL) { - MSG(NL, "%s %s\n", alpm_pkg_get_name(info), alpm_pkg_get_version(info)); - } - } else { - MSG(NL, "%s %s\n", alpm_pkg_get_name(info), alpm_pkg_get_version(info)); } } }