r4448 - trunk/src/target/opkg/libopkg

[thomas at docs.openmoko.org]

Author: thomas
Date: 2008-05-22 11:24:48 +0200 (Thu, 22 May 2008)
New Revision: 4448

Modified:
   trunk/src/target/opkg/libopkg/opkg.c
   trunk/src/target/opkg/libopkg/opkg_cmd.c
   trunk/src/target/opkg/libopkg/opkg_conf.c
   trunk/src/target/opkg/libopkg/opkg_conf.h
   trunk/src/target/opkg/libopkg/pkg.c
   trunk/src/target/opkg/libopkg/pkg.h
   trunk/src/target/opkg/libopkg/pkg_parse.c
Log:
opkg: remove redundant multiple_providers option and also remove redundant familiar_revision pointer from the pkg struct


Modified: trunk/src/target/opkg/libopkg/opkg.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg.c	2008-05-22 01:55:19 UTC (rev 4447)
+++ trunk/src/target/opkg/libopkg/opkg.c	2008-05-22 09:24:48 UTC (rev 4448)
@@ -235,7 +235,6 @@
   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)

Modified: trunk/src/target/opkg/libopkg/opkg_cmd.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_cmd.c	2008-05-22 01:55:19 UTC (rev 4447)
+++ trunk/src/target/opkg/libopkg/opkg_cmd.c	2008-05-22 09:24:48 UTC (rev 4448)
@@ -590,11 +590,7 @@
 
      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"

Modified: trunk/src/target/opkg/libopkg/opkg_conf.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_conf.c	2008-05-22 01:55:19 UTC (rev 4447)
+++ trunk/src/target/opkg/libopkg/opkg_conf.c	2008-05-22 09:24:48 UTC (rev 4448)
@@ -53,7 +53,6 @@
 	  { "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 @@
      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 @@
      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;
      } 

Modified: trunk/src/target/opkg/libopkg/opkg_conf.h
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_conf.h	2008-05-22 01:55:19 UTC (rev 4447)
+++ trunk/src/target/opkg/libopkg/opkg_conf.h	2008-05-22 09:24:48 UTC (rev 4448)
@@ -63,7 +63,6 @@
      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;

Modified: trunk/src/target/opkg/libopkg/pkg.c
===================================================================
--- trunk/src/target/opkg/libopkg/pkg.c	2008-05-22 01:55:19 UTC (rev 4447)
+++ trunk/src/target/opkg/libopkg/pkg.c	2008-05-22 09:24:48 UTC (rev 4448)
@@ -94,7 +94,6 @@
      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 @@
      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 */

Modified: trunk/src/target/opkg/libopkg/pkg.h
===================================================================
--- trunk/src/target/opkg/libopkg/pkg.h	2008-05-22 01:55:19 UTC (rev 4447)
+++ trunk/src/target/opkg/libopkg/pkg.h	2008-05-22 09:24:48 UTC (rev 4448)
@@ -117,7 +117,6 @@
      unsigned long epoch;
      char *version;
      char *revision;
-     char *familiar_revision;
      pkg_src_t *src;
      pkg_dest_t *dest;
      char *architecture;

Modified: trunk/src/target/opkg/libopkg/pkg_parse.c
===================================================================
--- trunk/src/target/opkg/libopkg/pkg_parse.c	2008-05-22 01:55:19 UTC (rev 4447)
+++ trunk/src/target/opkg/libopkg/pkg_parse.c	2008-05-22 09:24:48 UTC (rev 4448)
@@ -138,7 +138,6 @@
   }
 
   pkg->revision = "";
-  pkg->familiar_revision = "";
 
   if (!pkg->version)
   {
@@ -157,14 +156,6 @@
       pkg->revision = hyphen;
   }
 
-/*
-  fprintf(stderr,"Parsed version: %lu, %s, %s, %s\n",
-	  pkg->epoch,
-	  pkg->version,
-	  pkg->revision,
-	  pkg->familiar_revision);
-*/
-	  
   return 0;
 }