X-Git-Url: https://git.librecmc.org/?p=oweals%2Fopkg-lede.git;a=blobdiff_plain;f=libopkg%2Fopkg_cmd.c;h=ca9d9c930ea7f0a099c112eccbc6ab637d82c1f5;hp=572d8b7cb90793475bf519064e4802a37f082885;hb=b2b5908e2c248f7d21bde6cee2c523b24793dfa1;hpb=6afed21188df0c417349563621302ec85f44096f

diff --git a/libopkg/opkg_cmd.c b/libopkg/opkg_cmd.c
index 572d8b7..ca9d9c9 100644
--- a/libopkg/opkg_cmd.c
+++ b/libopkg/opkg_cmd.c
@@ -546,10 +546,8 @@ static int opkg_install_cmd(opkg_conf_t *conf, int argc, char **argv)
      for (i=0; i < argc; i++) {
 	  arg = argv[i];
           err = opkg_install_by_name(conf, arg);
-	  if (err == OPKG_PKG_HAS_NO_CANDIDATE) {
-	       opkg_message(conf, OPKG_ERROR,
-			    "Cannot find package %s.\n",
-			    arg);
+	  if (err) {
+	       opkg_message(conf, OPKG_ERROR, "Cannot find package %s.\n", arg);
 	  }
      }
 
@@ -631,7 +629,7 @@ static int opkg_download_cmd(opkg_conf_t *conf, int argc, char **argv)
      for (i = 0; i < argc; i++) {
 	  arg = argv[i];
 
-	  pkg = pkg_hash_fetch_best_installation_candidate_by_name(conf, arg, &err);
+	  pkg = pkg_hash_fetch_best_installation_candidate_by_name(conf, arg);
 	  if (pkg == NULL) {
 	       opkg_message(conf, OPKG_ERROR,
 			    "Cannot find package %s.\n"
@@ -716,7 +714,9 @@ static int opkg_list_upgradable_cmd(opkg_conf_t *conf, int argc, char **argv)
     char *old_v, *new_v;
     for (node = active_list_next(head, head); node;node = active_list_next(head,node)) {
         _old_pkg = list_entry(node, pkg_t, list);
-        _new_pkg = pkg_hash_fetch_best_installation_candidate_by_name(conf, _old_pkg->name, NULL);
+        _new_pkg = pkg_hash_fetch_best_installation_candidate_by_name(conf, _old_pkg->name);
+	if (_new_pkg == NULL)
+		continue;
         old_v = pkg_version_str_alloc(_old_pkg);
         new_v = pkg_version_str_alloc(_new_pkg);
         printf("%s - %s - %s\n", _old_pkg->name, old_v, new_v);
@@ -758,7 +758,7 @@ static int opkg_info_status_cmd(opkg_conf_t *conf, int argc, char **argv, int in
 		    conffile_t *cf = (conffile_t *)iter->data;
 		    int modified = conffile_has_been_modified(conf, cf);
 		    if (cf->value)
-		        opkg_message(conf, OPKG_NOTICE,
+		        opkg_message(conf, OPKG_INFO,
 				"conffile=%s md5sum=%s modified=%d\n",
 				 cf->name, cf->value, modified);
 	       }