opkg: remove verbose_wget option

git-svn-id: http://opkg.googlecode.com/svn/trunk@112 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358

diff --git a/libopkg/args.c b/libopkg/args.c
index 29e8852d8787d3857b4cefa2caebd980ef515d9a..fa2f633619d78ab1c486ae0fd3eb08d3815e2ffc 100644 (file)
--- a/libopkg/args.c
+++ b/libopkg/args.c
@@ -40,7 +40,6 @@ enum long_args_opt
      ARGS_OPT_FORCE_SPACE,
      ARGS_OPT_NOACTION,
      ARGS_OPT_NODEPS,
-     ARGS_OPT_VERBOSE_WGET,
      ARGS_OPT_VERBOSITY,
      ARGS_OPT_MULTIPLE_PROVIDERS,
      ARGS_OPT_AUTOREMOVE
@@ -71,7 +70,6 @@ int args_init(args_t *args)
      args->autoremove = ARGS_DEFAULT_AUTOREMOVE;
      args->noaction = ARGS_DEFAULT_NOACTION;
      args->nodeps = ARGS_DEFAULT_NODEPS;
-     args->verbose_wget = ARGS_DEFAULT_VERBOSE_WGET;
      args->verbosity = ARGS_DEFAULT_VERBOSITY;
      args->offline_root = ARGS_DEFAULT_OFFLINE_ROOT;
      args->offline_root_pre_script_cmd = ARGS_DEFAULT_OFFLINE_ROOT_PRE_SCRIPT_CMD;
@@ -130,8 +128,6 @@ int args_parse(args_t *args, int argc, char *argv[])
          {"offline-root", 1, 0, 'o'},
          {"test", 0, 0, ARGS_OPT_NOACTION},
          {"tmp-dir", 1, 0, 't'},
-         {"verbose-wget", 0, 0, ARGS_OPT_VERBOSE_WGET},
-         {"verbose_wget", 0, 0, ARGS_OPT_VERBOSE_WGET},
          {"verbosity", 2, 0, 'V'},
          {"version", 0, 0, 'v'},
          {0, 0, 0, 0}
@@ -199,9 +195,6 @@ int args_parse(args_t *args, int argc, char *argv[])
          case ARGS_OPT_FORCE_SPACE:
               args->force_space = 1;
               break;
-         case ARGS_OPT_VERBOSE_WGET:
-              args->verbose_wget = 1;
-              break;
          case ARGS_OPT_MULTIPLE_PROVIDERS:
               args->multiple_providers = 1;
               break;
@@ -284,7 +277,6 @@ void args_usage(char *complaint)
      printf("                          directory name in a pinch).\n");
      printf("\t-o <offline_root>       Use <offline_root> as the root directory for\n");
      printf("\t-offline <offline_root> offline installation of packages.\n");
-     printf("\t-verbose_wget           more wget messages\n");
     
      printf("\tForce Options (use when opkg is too smart for its own good):\n");
      printf("\t-force-depends          Make dependency checks warnings instead of errors\n");

diff --git a/libopkg/args.h b/libopkg/args.h
index 0c16d7e59da502d1a20c31d9f3cbf2a9ea48aa5d..08a04df6c5337986d4ff680b49d4b5430d9bcf17 100644 (file)
--- a/libopkg/args.h
+++ b/libopkg/args.h
@@ -35,7 +35,6 @@ struct args
     int nodeps;
     int multiple_providers;
     int query_all;
-    int verbose_wget;
     int verbosity;
     int nocheckfordirorfile;
     int noreadfeedsfile;

diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c
index cfee437032ff9c885d0cb83bd1e4620ca438db13..e2cbae5997da02be275c897d7ae694e52c55f409 100644 (file)
--- a/libopkg/opkg_conf.c
+++ b/libopkg/opkg_conf.c
@@ -64,7 +64,6 @@ int opkg_init_options_array(const opkg_conf_t *conf, opkg_option_t **options)
          { "proxy_passwd", OPKG_OPT_TYPE_STRING, &conf->proxy_passwd },
          { "proxy_user", OPKG_OPT_TYPE_STRING, &conf->proxy_user },
          { "query-all", OPKG_OPT_TYPE_BOOL, &conf->query_all },
-         { "verbose-wget", OPKG_OPT_TYPE_BOOL, &conf->verbose_wget },
          { "verbosity", OPKG_OPT_TYPE_BOOL, &conf->verbosity },
          { NULL }
      };
@@ -143,7 +142,6 @@ int opkg_conf_init(opkg_conf_t *conf, const args_t *args)
      conf->force_removal_of_essential_packages = 0;
      conf->force_removal_of_dependent_packages = 0;
      conf->nodeps = 0;
-     conf->verbose_wget = 0;
      conf->offline_root = NULL;
      conf->offline_root_pre_script_cmd = NULL;
      conf->offline_root_post_script_cmd = NULL;
@@ -264,9 +262,6 @@ int opkg_conf_init(opkg_conf_t *conf, const args_t *args)
      if (args->query_all) {
          conf->query_all = 1;
      }
-     if (args->verbose_wget) {
-         conf->verbose_wget = 1;
-     }
      if (args->multiple_providers) {
          conf->multiple_providers = 1;
      }

diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h
index 4b971b4fe8484e23020b52e4cc31f9fc97344514..bc8d36f8dfb0534fbeccae5d6bc3fb307d9e8c65 100644 (file)
--- a/libopkg/opkg_conf.h
+++ b/libopkg/opkg_conf.h
@@ -63,7 +63,6 @@ struct opkg_conf
      int force_removal_of_dependent_packages;
      int force_removal_of_essential_packages;
      int nodeps; /* do not follow dependences */
-     int verbose_wget;
      int multiple_providers;
      char *offline_root;
      char *offline_root_pre_script_cmd;