diff options
| author | Dan McGee <dan@archlinux.org> | 2007-03-12 02:25:40 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-03-12 02:25:40 +0100 |
| commit | 9ba23c8248eac4406b374f25feafcad873db89be (patch) | |
| tree | 9ec0920fcdb591a1646d087c6cd7171237b7fbb8 | |
| parent | 39478292afab79a1b3f8980316b7be66706392be (diff) | |
| download | pacman-9ba23c8248eac4406b374f25feafcad873db89be.tar.gz pacman-9ba23c8248eac4406b374f25feafcad873db89be.tar.xz | |
* Fixed -Qil regression, now both flags are honored. (FS #1355)
| -rw-r--r-- | src/pacman/query.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/pacman/query.c b/src/pacman/query.c index b4888d05..76cbc7fc 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -189,8 +189,7 @@ int pacman_query(alpm_list_t *targets) 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 @@ int pacman_query(alpm_list_t *targets) } /* 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 @@ int pacman_query(alpm_list_t *targets) 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)); } } } |