[oe-commits] org.oe.dev db: Use rm -rf instead of rmdir (which broke re-installation).

likewise commit openembedded-commits at lists.openembedded.org
Sat May 5 23:00:09 UTC 2007


db: Use rm -rf instead of rmdir (which broke re-installation).

Author: likewise at openembedded.org
Branch: org.openembedded.dev
Revision: 256d1626dc4d82851d7ec788cb021343cdfbc528
ViewMTN: http://monotone.openembedded.org/revision.psp?id=256d1626dc4d82851d7ec788cb021343cdfbc528
Files:
1
packages/db/db_4.2.52.bb
packages/db/db_4.3.29.bb
Diffs:

#
# mt diff -rc7fc783475ecbd6050f87b64ce52203a96c33f47 -r256d1626dc4d82851d7ec788cb021343cdfbc528
#
# 
# 
# patch "packages/db/db_4.2.52.bb"
#  from [07120f334340fff0df190427ad00bad90d4dd6c6]
#    to [41208c76d958528130660c526e5ef5b56e8181de]
# 
# patch "packages/db/db_4.3.29.bb"
#  from [77cc3ad5dff3c559c1da16b1e884b4b71193f04a]
#    to [ac62c653321f799c3e82eb83e6f784a82d29ae22]
# 
============================================================
--- packages/db/db_4.2.52.bb	07120f334340fff0df190427ad00bad90d4dd6c6
+++ packages/db/db_4.2.52.bb	41208c76d958528130660c526e5ef5b56e8181de
@@ -91,7 +91,7 @@ do_install_append() {
 	if test -d "${D}/${prefix}/docs"
 	then
 		mkdir -p "${D}/${datadir}"
-		test ! -d "${D}/${docdir}" || rmdir "${D}/${docdir}"
+		test ! -d "${D}/${docdir}" || rm -rf "${D}/${docdir}"
 		mv "${D}/${prefix}/docs" "${D}/${docdir}"
 	fi
 }
============================================================
--- packages/db/db_4.3.29.bb	77cc3ad5dff3c559c1da16b1e884b4b71193f04a
+++ packages/db/db_4.3.29.bb	ac62c653321f799c3e82eb83e6f784a82d29ae22
@@ -92,7 +92,7 @@ do_install_append() {
 	if test -d "${D}/${prefix}/docs"
 	then
 		mkdir -p "${D}/${datadir}"
-		test ! -d "${D}/${docdir}" || rmdir "${D}/${docdir}"
+		test ! -d "${D}/${docdir}" || rm -rf "${D}/${docdir}"
 		mv "${D}/${prefix}/docs" "${D}/${docdir}"
 	fi
 }






More information about the Openembedded-commits mailing list