opkg: forgot to remove two obsolete patches in last commit
authorJo-Philipp Wich <jow@openwrt.org>
Wed, 11 Nov 2009 22:13:10 +0000 (22:13 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Wed, 11 Nov 2009 22:13:10 +0000 (22:13 +0000)
SVN-Revision: 18381

package/opkg/patches/006-fix_force_space.patch [deleted file]
package/opkg/patches/011-fix_nullpointer_deref.patch [deleted file]

diff --git a/package/opkg/patches/006-fix_force_space.patch b/package/opkg/patches/006-fix_force_space.patch
deleted file mode 100644 (file)
index 80406ba..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/libopkg/opkg_conf.c
-+++ b/libopkg/opkg_conf.c
-@@ -252,6 +252,9 @@ int opkg_conf_init(opkg_conf_t *conf, co
-      if (args->force_downgrade) {
-         conf->force_downgrade = 1;
-      }
-+     if (args->force_space) {
-+        conf->force_space = 1;
-+     }
-      if (args->force_reinstall) {
-         conf->force_reinstall = 1;
-      }
diff --git a/package/opkg/patches/011-fix_nullpointer_deref.patch b/package/opkg/patches/011-fix_nullpointer_deref.patch
deleted file mode 100644 (file)
index ed198af..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/libopkg/opkg_cmd.c
-+++ b/libopkg/opkg_cmd.c
-@@ -954,7 +954,7 @@
-                   pkg_to_remove = pkg_hash_fetch_installed_by_name(&conf->pkg_hash, pkg->name );
-                }
-         
--               if (pkg == NULL) {
-+               if (pkg_to_remove == NULL) {
-                   opkg_message(conf, OPKG_ERROR, "Package %s is not installed.\n", pkg->name);
-                   continue;
-                }