1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-25 22:36:46 +02:00
openwrt-xburst/package/busybox/patches/521-ipkg_upgrade_env.patch
kaloz ac2d02c3e0 upgrade busybox to v1.11.1 and add current upstream fixes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12348 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-08-20 14:00:34 +00:00

40 lines
1.1 KiB
Diff

--- a/archival/libipkg/ipkg_install.c
+++ b/archival/libipkg/ipkg_install.c
@@ -136,6 +136,7 @@
ipkg_error_t ipkg_install_by_name(ipkg_conf_t *conf, const char *pkg_name)
{
int cmp;
+ int u = 0;
pkg_t *old, *new;
char *old_version, *new_version;
@@ -201,6 +202,7 @@
} else if (cmp < 0) {
new->dest = old->dest;
old->state_want = SW_DEINSTALL; /* Here probably the problem for bug 1277 */
+ u = 1;
}
}
@@ -211,7 +213,7 @@
anyone ever wants to make a nice libipkg. */
ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_pkg \n",__FUNCTION__);
- return ipkg_install_pkg(conf, new,0);
+ return ipkg_install_pkg(conf, new,u);
}
ipkg_error_t ipkg_install_multi_by_name(ipkg_conf_t *conf, const char *pkg_name)
@@ -750,8 +752,10 @@
char* file_md5;
- if ( from_upgrade )
+ if ( from_upgrade ) {
message = 1; /* Coming from an upgrade, and should change the output message */
+ setenv("IPKG_UPGRADE", "yes", 1);
+ }
if (!pkg) {
ipkg_message(conf, IPKG_ERROR,