mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-09-03 04:45:52 +03:00
22d6227505
- incorporates parsing improvements upstream - fixes a couple of memory leaks - fixes some null pointer dereferences - fixes possible crashes during removal of packages - various other corrections git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18380 3c298f89-4303-0410-b956-a3cf2f4a3e73
41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
--- a/libopkg/args.c
|
|
+++ b/libopkg/args.c
|
|
@@ -259,7 +259,7 @@
|
|
|
|
printf("\nPackage Manipulation:\n");
|
|
printf("\tupdate Update list of available packages\n");
|
|
- printf("\tupgrade Upgrade all installed packages to latest version\n");
|
|
+ printf("\tupgrade <pkg> Upgrade package to latest version\n");
|
|
printf("\tinstall <pkg> Download and install <pkg> (and dependencies)\n");
|
|
printf("\tinstall <file.opk> Install package <file.opk>\n");
|
|
printf("\tconfigure [<pkg>] Configure unpacked packages\n");
|
|
--- a/libopkg/opkg_cmd.c
|
|
+++ b/libopkg/opkg_cmd.c
|
|
@@ -75,7 +75,7 @@
|
|
array for easier maintenance */
|
|
static opkg_cmd_t cmds[] = {
|
|
{"update", 0, (opkg_cmd_fun_t)opkg_update_cmd},
|
|
- {"upgrade", 0, (opkg_cmd_fun_t)opkg_upgrade_cmd},
|
|
+ {"upgrade", 1, (opkg_cmd_fun_t)opkg_upgrade_cmd},
|
|
{"list", 0, (opkg_cmd_fun_t)opkg_list_cmd},
|
|
{"list_installed", 0, (opkg_cmd_fun_t)opkg_list_installed_cmd},
|
|
{"list_upgradable", 0, (opkg_cmd_fun_t)opkg_list_upgradable_cmd},
|
|
@@ -607,17 +607,6 @@
|
|
opkg_install_by_name(conf, arg);
|
|
}
|
|
}
|
|
- } else {
|
|
- pkg_vec_t *installed = pkg_vec_alloc();
|
|
-
|
|
- pkg_info_preinstall_check(conf);
|
|
-
|
|
- pkg_hash_fetch_all_installed(&conf->pkg_hash, installed);
|
|
- for (i = 0; i < installed->len; i++) {
|
|
- pkg = installed->pkgs[i];
|
|
- opkg_upgrade_pkg(conf, pkg);
|
|
- }
|
|
- pkg_vec_free(installed);
|
|
}
|
|
|
|
opkg_configure_packages(conf, NULL);
|