remove empty patches left over after [12348]
[openwrt/svn-archive/archive.git] / package / busybox / patches / 521-ipkg_upgrade_env.patch
1 --- a/archival/libipkg/ipkg_install.c
2 +++ b/archival/libipkg/ipkg_install.c
3 @@ -136,6 +136,7 @@
4 ipkg_error_t ipkg_install_by_name(ipkg_conf_t *conf, const char *pkg_name)
5 {
6 int cmp;
7 + int u = 0;
8 pkg_t *old, *new;
9 char *old_version, *new_version;
10
11 @@ -201,6 +202,7 @@
12 } else if (cmp < 0) {
13 new->dest = old->dest;
14 old->state_want = SW_DEINSTALL; /* Here probably the problem for bug 1277 */
15 + u = 1;
16 }
17 }
18
19 @@ -211,7 +213,7 @@
20 anyone ever wants to make a nice libipkg. */
21
22 ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_pkg \n",__FUNCTION__);
23 - return ipkg_install_pkg(conf, new,0);
24 + return ipkg_install_pkg(conf, new,u);
25 }
26
27 ipkg_error_t ipkg_install_multi_by_name(ipkg_conf_t *conf, const char *pkg_name)
28 @@ -750,8 +752,10 @@
29 char* file_md5;
30
31
32 - if ( from_upgrade )
33 + if ( from_upgrade ) {
34 message = 1; /* Coming from an upgrade, and should change the output message */
35 + setenv("IPKG_UPGRADE", "yes", 1);
36 + }
37
38 if (!pkg) {
39 ipkg_message(conf, IPKG_ERROR,