openwrt/package/opkg/patches/009-remove-upgrade-all.patch
Florian Fainelli b55f4bdd60 Merge branch 'master' of git://nbd.name/openwrt
Conflicts:

	package/opkg/patches/009-remove-upgrade-all.patch

SVN-Revision: 23532
2010-10-19 07:06:12 +00:00

42 lines
1.5 KiB
Diff

--- a/libopkg/opkg_cmd.c
+++ b/libopkg/opkg_cmd.c
@@ -508,18 +508,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))
@@ -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},
- {"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},
--- a/src/opkg-cl.c
+++ b/src/opkg-cl.c
@@ -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 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");