aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-03-01 18:01:33 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-03-01 18:01:33 +0000
commite2e39dae904a495bd7ccbe1b08cee3365d7fcde3 (patch)
tree2bc9acd85c985d174859670d1855cd41f4774221 /scripts
parent0cd5b9983ffe591b1836a5f8b94da91cfb9cf6ef (diff)
downloadupstream-e2e39dae904a495bd7ccbe1b08cee3365d7fcde3.tar.gz
upstream-e2e39dae904a495bd7ccbe1b08cee3365d7fcde3.tar.bz2
upstream-e2e39dae904a495bd7ccbe1b08cee3365d7fcde3.zip
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
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/ipkg2
1 files changed, 1 insertions, 1 deletions
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