summaryrefslogtreecommitdiffstats
path: root/libopkg
diff options
context:
space:
mode:
authorticktock35 <ticktock35@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>2008-12-15 00:19:30 (EST)
committer ticktock35 <ticktock35@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>2008-12-15 00:19:30 (EST)
commit6e5ac111a68f68c28e973719154a0acfdbeaf7d6 (patch)
treed1094c0081ff3924311cb1b0d2adf24bd8f53b19 /libopkg
parent8c5b3a601366faa6901f7f58ef3543fb9b93dc12 (diff)
opkg: remove redundant multiple_providers option and also remove redundant familiar_revision pointer from the pkg struct
git-svn-id: http://opkg.googlecode.com/svn/trunk@118 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358
Diffstat (limited to 'libopkg')
-rw-r--r--libopkg/opkg.c1
-rw-r--r--libopkg/opkg_cmd.c6
-rw-r--r--libopkg/opkg_conf.c5
-rw-r--r--libopkg/opkg_conf.h1
-rw-r--r--libopkg/pkg.c4
-rw-r--r--libopkg/pkg.h1
-rw-r--r--libopkg/pkg_parse.c9
7 files changed, 2 insertions, 25 deletions
diff --git a/libopkg/opkg.c b/libopkg/opkg.c
index 18115fb..00d595e 100644
--- a/libopkg/opkg.c
+++ b/libopkg/opkg.c
@@ -235,7 +235,6 @@ opkg_re_read_config_files (opkg_t *opkg)
a->nodeps = c->nodeps;
a->noaction = c->noaction;
a->query_all = c->query_all;
- a->multiple_providers = c->multiple_providers;
a->verbosity = c->verbosity;
if (c->offline_root)
diff --git a/libopkg/opkg_cmd.c b/libopkg/opkg_cmd.c
index 7278659..d883c7b 100644
--- a/libopkg/opkg_cmd.c
+++ b/libopkg/opkg_cmd.c
@@ -590,11 +590,7 @@ static int opkg_install_cmd(opkg_conf_t *conf, int argc, char **argv)
for (i=0; i < argc; i++) {
arg = argv[i];
- if (conf->multiple_providers)
- err = opkg_install_multi_by_name(conf, arg);
- else{
- err = opkg_install_by_name(conf, arg);
- }
+ err = opkg_install_by_name(conf, arg);
if (err == OPKG_PKG_HAS_NO_CANDIDATE) {
opkg_message(conf, OPKG_ERROR,
"Cannot find package %s.\n"
diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c
index 75ca48b..ba0daf5 100644
--- a/libopkg/opkg_conf.c
+++ b/libopkg/opkg_conf.c
@@ -53,7 +53,6 @@ int opkg_init_options_array(const opkg_conf_t *conf, opkg_option_t **options)
{ "force_space", OPKG_OPT_TYPE_BOOL, &conf->force_space },
{ "ftp_proxy", OPKG_OPT_TYPE_STRING, &conf->ftp_proxy },
{ "http_proxy", OPKG_OPT_TYPE_STRING, &conf->http_proxy },
- { "multiple_providers", OPKG_OPT_TYPE_BOOL, &conf->multiple_providers },
{ "no_proxy", OPKG_OPT_TYPE_STRING, &conf->no_proxy },
{ "test", OPKG_OPT_TYPE_INT, &conf->noaction },
{ "noaction", OPKG_OPT_TYPE_INT, &conf->noaction },
@@ -145,7 +144,6 @@ int opkg_conf_init(opkg_conf_t *conf, const args_t *args)
conf->offline_root = NULL;
conf->offline_root_pre_script_cmd = NULL;
conf->offline_root_post_script_cmd = NULL;
- conf->multiple_providers = 0;
conf->verbosity = 1;
conf->noaction = 0;
@@ -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->multiple_providers) {
- conf->multiple_providers = 1;
- }
if (args->verbosity != conf->verbosity) {
conf->verbosity = args->verbosity;
}
diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h
index 566bf46..6e202d4 100644
--- 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 multiple_providers;
char *offline_root;
char *offline_root_pre_script_cmd;
char *offline_root_post_script_cmd;
diff --git a/libopkg/pkg.c b/libopkg/pkg.c
index 6793c82..a4f242b 100644
--- a/libopkg/pkg.c
+++ b/libopkg/pkg.c
@@ -94,7 +94,6 @@ int pkg_init(pkg_t *pkg)
pkg->epoch = 0;
pkg->version = NULL;
pkg->revision = NULL;
- pkg->familiar_revision = NULL;
pkg->dest = NULL;
pkg->src = NULL;
pkg->architecture = NULL;
@@ -164,10 +163,9 @@ void pkg_deinit(pkg_t *pkg)
pkg->epoch = 0;
free(pkg->version);
pkg->version = NULL;
- /* revision and familiar_revision share storage with version, so
+ /* revision shares storage with version, so
don't free */
pkg->revision = NULL;
- pkg->familiar_revision = NULL;
/* owned by opkg_conf_t */
pkg->dest = NULL;
/* owned by opkg_conf_t */
diff --git a/libopkg/pkg.h b/libopkg/pkg.h
index 02bfa0b..e7239f1 100644
--- a/libopkg/pkg.h
+++ b/libopkg/pkg.h
@@ -117,7 +117,6 @@ struct pkg
unsigned long epoch;
char *version;
char *revision;
- char *familiar_revision;
pkg_src_t *src;
pkg_dest_t *dest;
char *architecture;
diff --git a/libopkg/pkg_parse.c b/libopkg/pkg_parse.c
index cf3a882..9b43754 100644
--- a/libopkg/pkg_parse.c
+++ b/libopkg/pkg_parse.c
@@ -138,7 +138,6 @@ int parseVersion(pkg_t *pkg, char *raw)
}
pkg->revision = "";
- pkg->familiar_revision = "";
if (!pkg->version)
{
@@ -157,14 +156,6 @@ int parseVersion(pkg_t *pkg, char *raw)
pkg->revision = hyphen;
}
-/*
- fprintf(stderr,"Parsed version: %lu, %s, %s, %s\n",
- pkg->epoch,
- pkg->version,
- pkg->revision,
- pkg->familiar_revision);
-*/
-
return 0;
}