瀏覽代碼

remove empty directories after origin /etc files are removed (workarounds a seldom segfault)

Waldemar Brodkorb 13 年之前
父節點
當前提交
b2ae8e3c7b
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      package/cfgfs/Makefile
  2. 1 1
      package/cfgfs/src/fwcf.sh

+ 1 - 1
package/cfgfs/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cfgfs
 PKG_VERSION:=		1.0.8
-PKG_RELEASE:=		5
+PKG_RELEASE:=		6
 PKG_DESCR:=		compressed config filesystem
 PKG_SECTION:=		base
 PKG_URL:=		http://openadk.org/

+ 1 - 1
package/cfgfs/src/fwcf.sh

@@ -257,7 +257,6 @@ if test $1 = commit; then
 	    cfgfs.helper -Z - /tmp/.cfgfs/status.asz
 	cd /tmp/.cfgfs/root
 	rm -f /tmp/.cfgfs/temp/.cfgfs_* /tmp/.cfgfs/temp/.rnd
-	find /tmp/.cfgfs/temp -type d -empty -delete
 	find . -type f | while read f; do
 		f=${f#./}
 		if [[ ! -e /tmp/.cfgfs/temp/$f ]]; then
@@ -269,6 +268,7 @@ if test $1 = commit; then
 		y=$(cd ../temp; md5sum "$f" 2>/dev/null)
 		[[ "$x" = "$y" ]] && rm "../temp/$f"
 	done
+	find /tmp/.cfgfs/temp -type d -empty -delete
 	rv=0
 	if [ $mtd -eq 1 ]; then
 		if ! ( cfgfs.helper -M /tmp/.cfgfs/temp | eval $mtdtool -F write - cfgfs ); then