aboutsummaryrefslogtreecommitdiffstats
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
commit3e0dc48650e698e533a6de1ddba9d9ff10a18ff8 (patch)
treee540394c5d9d265938f986a7d209f05bb61b70f9
parentb49f5fd5b07295b56aceb6c66908365940db1001 (diff)
downloadmaster-187ad058-3e0dc48650e698e533a6de1ddba9d9ff10a18ff8.tar.gz
master-187ad058-3e0dc48650e698e533a6de1ddba9d9ff10a18ff8.tar.bz2
master-187ad058-3e0dc48650e698e533a6de1ddba9d9ff10a18ff8.zip
[scripts] 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) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19936 3c298f89-4303-0410-b956-a3cf2f4a3e73
-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