cli: enforce argument to upgrade command

[oweals/opkg-lede.git] / libopkg / opkg_cmd.c

diff --git a/libopkg/opkg_cmd.c b/libopkg/opkg_cmd.c
index 584d05d11102c8e6497f941d3aaa615ee6725d5d..eba833bd7bdce4083f2070907c38c59da0eacf92 100644 (file)
--- a/libopkg/opkg_cmd.c
+++ b/libopkg/opkg_cmd.c
@@ -27,6 +27,7 @@
 #include "opkg_conf.h"
 #include "opkg_cmd.h"
 #include "opkg_message.h"
+#include "release.h"
 #include "pkg.h"
 #include "pkg_dest.h"
 #include "pkg_parse.h"
@@ -113,11 +114,47 @@ opkg_update_cmd(int argc, char **argv)
      }
 
 
+     for (iter = void_list_first(&conf->dist_src_list); iter; iter = void_list_next(&conf->dist_src_list, iter)) {
+         char *url, *list_file_name;
+
+         src = (pkg_src_t *)iter->data;
+
+         sprintf_alloc(&url, "%s/dists/%s/Release", src->value, src->name);
+
+         sprintf_alloc(&list_file_name, "%s/%s", lists_dir, src->name);
+         err = opkg_download(url, list_file_name, NULL, NULL, 0);
+         if (!err) {
+              opkg_msg(NOTICE, "Downloaded release files for dist %s.\n",
+                           src->name);
+              release_t *release = release_new(); 
+              err = release_init_from_file(release, list_file_name);
+              if (!err) {
+                   if (!release_comps_supported(release, src->extra_data))
+                        err = -1;
+              }
+              if (!err) {
+                   err = release_download(release, src, lists_dir, tmp);
+              }
+              release_deinit(release); 
+              if (err)
+                   unlink(list_file_name);
+         }
+
+         if (err)
+              failures++;
+
+         free(list_file_name);
+         free(url);
+     }
+
      for (iter = void_list_first(&conf->pkg_src_list); iter; iter = void_list_next(&conf->pkg_src_list, iter)) {
          char *url, *list_file_name;
 
          src = (pkg_src_t *)iter->data;
 
+         if (src->extra_data && strcmp(src->extra_data, "__dummy__ "))
+             continue;
+
          if (src->extra_data)  /* debian style? */
              sprintf_alloc(&url, "%s/%s/%s", src->value, src->extra_data,
                            src->gzip ? "Packages.gz" : "Packages");
@@ -130,7 +167,7 @@ opkg_update_cmd(int argc, char **argv)
              FILE *in, *out;
 
              sprintf_alloc (&tmp_file_name, "%s/%s.gz", tmp, src->name);
-             err = opkg_download(url, tmp_file_name, NULL, NULL);
+             err = opkg_download(url, tmp_file_name, NULL, NULL, 0);
              if (err == 0) {
                   opkg_msg(NOTICE, "Inflating %s.\n", url);
                   in = fopen (tmp_file_name, "r");
@@ -147,7 +184,7 @@ opkg_update_cmd(int argc, char **argv)
              }
              free(tmp_file_name);
          } else
-             err = opkg_download(url, list_file_name, NULL, NULL);
+             err = opkg_download(url, list_file_name, NULL, NULL, 0);
          if (err) {
               failures++;
          } else {
@@ -171,7 +208,7 @@ opkg_update_cmd(int argc, char **argv)
               /* Put the signature in the right place */
               sprintf_alloc (&tmp_file_name, "%s/%s.sig", lists_dir, src->name);
 
-              err = opkg_download(url, tmp_file_name, NULL, NULL);
+              err = opkg_download(url, tmp_file_name, NULL, NULL, 0);
               if (err) {
                   failures++;
                   opkg_msg(NOTICE, "Signature check failed.\n");
@@ -182,6 +219,12 @@ opkg_update_cmd(int argc, char **argv)
                   else
                       opkg_msg(NOTICE, "Signature check failed.\n");
               }
+              if (err) {
+                  /* The signature was wrong so delete it */
+                  opkg_msg(NOTICE, "Remove wrong Signature file.\n");
+                  unlink (tmp_file_name);
+                  unlink (list_file_name);
+              }
               /* We shouldn't unlink the signature ! */
               // unlink (tmp_file_name);
               free (tmp_file_name);
@@ -508,18 +551,6 @@ opkg_upgrade_cmd(int argc, char **argv)
                            err = -1;
                }
          }
-     } else {
-         pkg_vec_t *installed = pkg_vec_alloc();
-
-         pkg_info_preinstall_check();
-
-         pkg_hash_fetch_all_installed(installed);
-         for (i = 0; i < installed->len; i++) {
-              pkg = installed->pkgs[i];
-              if (opkg_upgrade_pkg(pkg))
-                      err = -1;
-         }
-         pkg_vec_free(installed);
      }
 
      if (opkg_configure_packages(NULL))
@@ -1042,7 +1073,7 @@ opkg_what_depends_conflicts_cmd(enum depend_type what_field_type, int recursive,
                                        if (!pkg_dependence_satisfiable(possibility))
                                                opkg_msg(NOTICE,
                                                        " unsatisfiable");
-                                       opkg_msg(NOTICE, "\n");
+                                       opkg_message(NOTICE, "\n");
                                        goto next_package;
                                }
                        }
@@ -1121,7 +1152,7 @@ opkg_what_provides_replaces_cmd(enum what_field_type what_field_type, int argc,
                              if (strcmp(target, apkg->name) != 0)
                                   opkg_msg(NOTICE, "\t%s %s\n",
                                                   rel_str, apkg->name);
-                             opkg_msg(NOTICE, "\n");
+                             opkg_message(NOTICE, "\n");
                         }
                    }
               }
@@ -1215,7 +1246,7 @@ opkg_print_architecture_cmd(int argc, char **argv)
    array for easier maintenance */
 static opkg_cmd_t cmds[] = {
      {"update", 0, (opkg_cmd_fun_t)opkg_update_cmd, PFM_DESCRIPTION|PFM_SOURCE},
-     {"upgrade", 0, (opkg_cmd_fun_t)opkg_upgrade_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+     {"upgrade", 1, (opkg_cmd_fun_t)opkg_upgrade_cmd, PFM_DESCRIPTION|PFM_SOURCE},
      {"list", 0, (opkg_cmd_fun_t)opkg_list_cmd, PFM_SOURCE},
      {"list_installed", 0, (opkg_cmd_fun_t)opkg_list_installed_cmd, PFM_SOURCE},
      {"list-installed", 0, (opkg_cmd_fun_t)opkg_list_installed_cmd, PFM_SOURCE},