opkg: remove redundant multiple_providers option and also remove redundant familiar_r...

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

diff --git a/libopkg/opkg.c b/libopkg/opkg.c
index 18115fb550c3daa47e0ed22b54938f9c43a09f0c..00d595e04110a2f5fb74bc3e44384157c09cc6fc 100644 (file)
--- 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->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)
   a->verbosity = c->verbosity;
 
   if (c->offline_root)

diff --git a/libopkg/opkg_cmd.c b/libopkg/opkg_cmd.c
index 7278659dc2290abd9b32916b80c913b7681c8d21..d883c7b02b2e0fbf7efae44a40312d822886b869 100644 (file)
--- 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];
 
      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"
          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 75ca48b1f81bf1b0cb27b6668fa501731fd89c60..ba0daf5de1c58dfb4c43835c860edcd06a2a916f 100644 (file)
--- 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 },
          { "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 },
          { "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->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;
 
      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->query_all) {
          conf->query_all = 1;
      }

-     if (args->multiple_providers) {
-         conf->multiple_providers = 1;
-     }

      if (args->verbosity != conf->verbosity) {
          conf->verbosity = args->verbosity;
      } 
      if (args->verbosity != conf->verbosity) {
          conf->verbosity = args->verbosity;
      } 

diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h
index 566bf463f49f526d63b4c91a0cb90a6ba328d3bf..6e202d46b0a73b8770614c5112b098bd26a9e5df 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 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;
      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 6793c826ee0188fc5bc8df7f625142d9cb888828..a4f242bf3a9300b24fff95a7686573dc381b3bde 100644 (file)
--- 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->epoch = 0;
      pkg->version = NULL;
      pkg->revision = NULL;

-     pkg->familiar_revision = NULL;

      pkg->dest = NULL;
      pkg->src = NULL;
      pkg->architecture = 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;
      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;
        don't free */
      pkg->revision = NULL;

-     pkg->familiar_revision = NULL;

      /* owned by opkg_conf_t */
      pkg->dest = NULL;
      /* owned by opkg_conf_t */
      /* owned by opkg_conf_t */
      pkg->dest = NULL;
      /* owned by opkg_conf_t */

diff --git a/libopkg/pkg.h b/libopkg/pkg.h
index 02bfa0b16af708c5797efca957e4e98f96fc517c..e7239f13311b9c78ca9aa6302ef523deb0eb39ec 100644 (file)
--- a/libopkg/pkg.h
+++ b/libopkg/pkg.h
@@ -117,7 +117,6 @@ struct pkg
      unsigned long epoch;
      char *version;
      char *revision;
      unsigned long epoch;
      char *version;
      char *revision;

-     char *familiar_revision;

      pkg_src_t *src;
      pkg_dest_t *dest;
      char *architecture;
      pkg_src_t *src;
      pkg_dest_t *dest;
      char *architecture;

diff --git a/libopkg/pkg_parse.c b/libopkg/pkg_parse.c
index cf3a882bd339f267c057d8a37cd30197a5f0ae25..9b43754e04a6e51dcb305f4a6dc5a65c6cf91703 100644 (file)
--- a/libopkg/pkg_parse.c
+++ b/libopkg/pkg_parse.c
@@ -138,7 +138,6 @@ int parseVersion(pkg_t *pkg, char *raw)
   }
 
   pkg->revision = "";
   }
 
   pkg->revision = "";

-  pkg->familiar_revision = "";

 
   if (!pkg->version)
   {
 
   if (!pkg->version)
   {


@@ -157,14 +156,6 @@ int parseVersion(pkg_t *pkg, char *raw)
       pkg->revision = hyphen;
   }
 
       pkg->revision = hyphen;
   }
 

-/*
-  fprintf(stderr,"Parsed version: %lu, %s, %s, %s\n",
-         pkg->epoch,
-         pkg->version,
-         pkg->revision,
-         pkg->familiar_revision);
-*/
-         

   return 0;
 }
 
   return 0;
 }