320f7100585316b29596bdadc6934bc731b426b6
[openwrt/svn-archive/archive.git] / package / opkg / patches / 009-remove-upgrade-all.patch
1 --- a/libopkg/args.c
2 +++ b/libopkg/args.c
3 @@ -263,7 +263,7 @@
4
5 printf("\nPackage Manipulation:\n");
6 printf("\tupdate Update list of available packages\n");
7 - printf("\tupgrade Upgrade all installed packages to latest version\n");
8 + printf("\tupgrade <pkg> Upgrade package to latest version\n");
9 printf("\tinstall <pkg> Download and install <pkg> (and dependencies)\n");
10 printf("\tinstall <file.opk> Install package <file.opk>\n");
11 printf("\tconfigure [<pkg>] Configure unpacked packages\n");
12 --- a/libopkg/opkg_cmd.c
13 +++ b/libopkg/opkg_cmd.c
14 @@ -79,7 +79,7 @@
15 array for easier maintenance */
16 static opkg_cmd_t cmds[] = {
17 {"update", 0, (opkg_cmd_fun_t)opkg_update_cmd},
18 - {"upgrade", 0, (opkg_cmd_fun_t)opkg_upgrade_cmd},
19 + {"upgrade", 1, (opkg_cmd_fun_t)opkg_upgrade_cmd},
20 {"list", 0, (opkg_cmd_fun_t)opkg_list_cmd},
21 {"list_installed", 0, (opkg_cmd_fun_t)opkg_list_installed_cmd},
22 {"list_upgradable", 0, (opkg_cmd_fun_t)opkg_list_upgradable_cmd},
23 @@ -640,17 +640,6 @@
24 opkg_install_by_name(conf, arg);
25 }
26 }
27 - } else {
28 - pkg_vec_t *installed = pkg_vec_alloc();
29 -
30 - pkg_info_preinstall_check(conf);
31 -
32 - pkg_hash_fetch_all_installed(&conf->pkg_hash, installed);
33 - for (i = 0; i < installed->len; i++) {
34 - pkg = installed->pkgs[i];
35 - opkg_upgrade_pkg(conf, pkg);
36 - }
37 - pkg_vec_free(installed);
38 }
39
40 /* recheck to verify that all dependences are satisfied */