From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 1 Mar 2010 18:01:33 +0000 (+0000)
Subject: ipkg: strip directory entries from package file list when offline installing .ipk... 
X-Git-Tag: reboot~20866
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e2e39dae904a495bd7ccbe1b08cee3365d7fcde3;p=openwrt%2Fstaging%2Fchunkeey.git

ipkg: strip directory entries from package file list when offline installing .ipk archives, this prevents opkg from removing directories like /usr later on when trying to uninstall preinstalled packages (partial fix for #6772)

SVN-Revision: 19936
---

diff --git a/scripts/ipkg b/scripts/ipkg
index 045a3fd2a2..da6447c978 100755
--- a/scripts/ipkg
+++ b/scripts/ipkg
@@ -875,7 +875,7 @@ diff -u $dest/$conffile $IPKG_TMP/$pkg/data/$conffile"
 	rm -rf $IPKG_TMP/$pkg/data
 	rmdir $IPKG_TMP/$pkg
 	rm -f $info_dir/$pkg.list
-	$pkg_extract_stdout $filename ./data.tar.gz | zcat | tar tf - | sed -e 's/^\.//' > $info_dir/$pkg.list
+	$pkg_extract_stdout $filename ./data.tar.gz | zcat | tar tf - | sed -e '/\/$/d; s/^\.//' > $info_dir/$pkg.list
 
 	if [ -x "$info_dir/$pkg.postinst" ]; then
 		$info_dir/$pkg.postinst configure