X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=package%2Fopkg%2Fpatches%2F009-remove-upgrade-all.patch;h=17424949460b5b99ed47c6905e7f7d13de6e7f5d;hb=a1b087b6817e0d82b92ce55217c77ae7ed36f73e;hp=be76ef53ce84083b91c78716fcfa753192e0b540;hpb=f7da9d967113f40f07ac7f4254027e665ead7642;p=openwrt.git

diff --git a/package/opkg/patches/009-remove-upgrade-all.patch b/package/opkg/patches/009-remove-upgrade-all.patch
index be76ef53ce..1742494946 100644
--- a/package/opkg/patches/009-remove-upgrade-all.patch
+++ b/package/opkg/patches/009-remove-upgrade-all.patch
@@ -1,7 +1,7 @@
 --- a/libopkg/opkg_cmd.c
 +++ b/libopkg/opkg_cmd.c
-@@ -498,17 +498,6 @@ opkg_upgrade_cmd(int argc, char **argv)
- 		    opkg_install_by_name(arg);
+@@ -508,18 +508,6 @@ opkg_upgrade_cmd(int argc, char **argv)
+ 			    err = -1;
                 }
  	  }
 -     } else {
@@ -12,13 +12,14 @@
 -	  pkg_hash_fetch_all_installed(installed);
 -	  for (i = 0; i < installed->len; i++) {
 -	       pkg = installed->pkgs[i];
--	       opkg_upgrade_pkg(pkg);
+-	       if (opkg_upgrade_pkg(pkg))
+-		       err = -1;
 -	  }
 -	  pkg_vec_free(installed);
       }
  
-      opkg_configure_packages(NULL);
-@@ -1166,7 +1155,7 @@ opkg_print_architecture_cmd(int argc, ch
+      if (opkg_configure_packages(NULL))
+@@ -1182,7 +1170,7 @@ opkg_print_architecture_cmd(int argc, ch
     array for easier maintenance */
  static opkg_cmd_t cmds[] = {
       {"update", 0, (opkg_cmd_fun_t)opkg_update_cmd, PFM_DESCRIPTION|PFM_SOURCE},
@@ -29,12 +30,12 @@
       {"list-installed", 0, (opkg_cmd_fun_t)opkg_list_installed_cmd, PFM_SOURCE},
 --- a/src/opkg-cl.c
 +++ b/src/opkg-cl.c
-@@ -187,7 +187,7 @@ usage()
+@@ -217,7 +217,7 @@ usage()
  
  	printf("\nPackage Manipulation:\n");
  	printf("\tupdate			Update list of available packages\n");
 -	printf("\tupgrade			Upgrade installed packages\n");
-+	printf("\tupgrade <pkgs>		Upgrade package(s)\n");
++	printf("\tupgrade <pkgs>		Upgrade packages\n");
  	printf("\tinstall <pkgs>		Install package(s)\n");
  	printf("\tconfigure <pkgs>	Configure unpacked package(s)\n");
  	printf("\tremove <pkgs|regexp>	Remove package(s)\n");