Compare verbosity to a message_level_t.
authorgraham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>
Fri, 13 Nov 2009 01:07:00 +0000 (01:07 +0000)
committergraham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>
Fri, 13 Nov 2009 01:07:00 +0000 (01:07 +0000)
git-svn-id: http://opkg.googlecode.com/svn/trunk@293 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358

libopkg/opkg_cmd.c
libopkg/pkg_hash.c

index afa9ccf..9a49082 100644 (file)
@@ -758,7 +758,7 @@ static int opkg_info_status_cmd(opkg_conf_t *conf, int argc, char **argv, int in
 
          pkg_formatted_info(stdout, pkg);
 
-         if (conf->verbosity > 1) {
+         if (conf->verbosity >= OPKG_NOTICE) {
               conffile_list_elt_t *iter;
               for (iter = nv_pair_list_first(&pkg->conffiles); iter; iter = nv_pair_list_next(&pkg->conffiles, iter)) {
                    conffile_t *cf = (conffile_t *)iter->data;
@@ -1080,8 +1080,7 @@ static int opkg_depends_cmd(opkg_conf_t *conf, int argc, char **argv)
                              for (l = 0; l < cdepend->possibility_count; l++) {
                                   depend_t *possibility = cdepend->possibilities[l];
                                   opkg_message(conf, OPKG_ERROR, "    %s", possibility->pkg->name);
-                                  if (conf->verbosity > 0) {
-                                       // char *ver = abstract_pkg_version_str_alloc(possibility->pkg); 
+                                  if (conf->verbosity >= OPKG_NOTICE) {
                                        opkg_message(conf, OPKG_NOTICE, " %s", possibility->version);
                                        if (possibility->version) {
                                             char *typestr = NULL;
@@ -1095,7 +1094,6 @@ static int opkg_depends_cmd(opkg_conf_t *conf, int argc, char **argv)
                                             }
                                             opkg_message(conf, OPKG_NOTICE, " (%s %s)", typestr, possibility->version);
                                        }
-                                       // free(ver);
                                   }
                                   opkg_message(conf, OPKG_ERROR, "\n");
                              }
@@ -1183,9 +1181,9 @@ static int opkg_what_depends_conflicts_cmd(opkg_conf_t *conf, enum what_field_ty
                                   pkg_mark_provides(pkg);
                                   changed++;
 
-                                  opkg_message(conf, OPKG_NOTICE, "    %s", pkg->name);
-                                  if (conf->verbosity > 0) {
+                                  if (conf->verbosity >= OPKG_NOTICE) {
                                        char *ver = pkg_version_str_alloc(pkg); 
+                                       opkg_message(conf, OPKG_NOTICE, "    %s", pkg->name);
                                        opkg_message(conf, OPKG_NOTICE, " %s", ver);
                                        opkg_message(conf, OPKG_NOTICE, "\t%s %s", rel_str, possibility->pkg->name);
                                        if (possibility->version) {
index a445839..62e6f0a 100644 (file)
@@ -325,7 +325,7 @@ pkg_t *pkg_hash_fetch_best_installation_candidate(opkg_conf_t *conf, abstract_pk
           
           }
 
-     if (matching_apkgs->len > 1 && conf->verbosity > 1) {
+     if (conf->verbosity >= OPKG_NOTICE && matching_apkgs->len > 1) {
          opkg_message(conf, OPKG_NOTICE, "%s: for apkg=%s, %d matching pkgs\n",
                       __FUNCTION__, apkg->name, matching_pkgs->len);
          for (i = 0; i < matching_pkgs->len; i++) {