r4440 - trunk/src/target/opkg/libopkg
thomas at docs.openmoko.org
thomas at docs.openmoko.org
Fri May 16 14:21:51 CEST 2008
Author: thomas
Date: 2008-05-16 14:21:50 +0200 (Fri, 16 May 2008)
New Revision: 4440
Modified:
trunk/src/target/opkg/libopkg/args.c
trunk/src/target/opkg/libopkg/args.h
trunk/src/target/opkg/libopkg/opkg_conf.c
trunk/src/target/opkg/libopkg/opkg_conf.h
Log:
opkg: remove verbose_wget option
Modified: trunk/src/target/opkg/libopkg/args.c
===================================================================
--- trunk/src/target/opkg/libopkg/args.c 2008-05-15 16:34:23 UTC (rev 4439)
+++ trunk/src/target/opkg/libopkg/args.c 2008-05-16 12:21:50 UTC (rev 4440)
@@ -40,7 +40,6 @@
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 @@
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 @@
{"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 @@
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 @@
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");
Modified: trunk/src/target/opkg/libopkg/args.h
===================================================================
--- trunk/src/target/opkg/libopkg/args.h 2008-05-15 16:34:23 UTC (rev 4439)
+++ trunk/src/target/opkg/libopkg/args.h 2008-05-16 12:21:50 UTC (rev 4440)
@@ -35,7 +35,6 @@
int nodeps;
int multiple_providers;
int query_all;
- int verbose_wget;
int verbosity;
int nocheckfordirorfile;
int noreadfeedsfile;
Modified: trunk/src/target/opkg/libopkg/opkg_conf.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_conf.c 2008-05-15 16:34:23 UTC (rev 4439)
+++ trunk/src/target/opkg/libopkg/opkg_conf.c 2008-05-16 12:21:50 UTC (rev 4440)
@@ -64,7 +64,6 @@
{ "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 @@
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 @@
if (args->query_all) {
conf->query_all = 1;
}
- if (args->verbose_wget) {
- conf->verbose_wget = 1;
- }
if (args->multiple_providers) {
conf->multiple_providers = 1;
}
Modified: trunk/src/target/opkg/libopkg/opkg_conf.h
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_conf.h 2008-05-15 16:34:23 UTC (rev 4439)
+++ trunk/src/target/opkg/libopkg/opkg_conf.h 2008-05-16 12:21:50 UTC (rev 4440)
@@ -63,7 +63,6 @@
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;
More information about the commitlog
mailing list