[oe-commits] Phil Blundell : gconf: Avoid error when trying to delete files that don' t exist

git at git.openembedded.org git at git.openembedded.org
Thu Oct 18 11:26:27 UTC 2012


Module: openembedded-core.git
Branch: master-next
Commit: 2ee9601ae590b2964d1c44b131188a80cc5198a9
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=2ee9601ae590b2964d1c44b131188a80cc5198a9

Author: Phil Blundell <philb at gnu.org>
Date:   Wed Oct 17 23:25:17 2012 +0100

gconf: Avoid error when trying to delete files that don't exist

Use "rm -f" in do_install_append() so we don't fail if the files we're
trying to delete have already been removed.  This can happen if the
distro policy suppresses both static libs and .la files.

Signed-off-by: Phil Blundell <pb at pbcl.net>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-gnome/gnome/gconf_3.2.3.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-gnome/gnome/gconf_3.2.3.bb b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
index dc3520f..4d77a14 100644
--- a/meta/recipes-gnome/gnome/gconf_3.2.3.bb
+++ b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
@@ -33,8 +33,8 @@ do_install_append() {
 	install -d ${D}${sysconfdir}/gconf/gconf.xml.system
 
 	# this stuff is unusable
-	rm ${D}${libdir}/GConf/*/*.*a
-	rm ${D}${libdir}/gio/*/*.*a
+	rm -f ${D}${libdir}/GConf/*/*.*a
+	rm -f ${D}${libdir}/gio/*/*.*a
 }
 
 # disable dbus-x11 when x11 isn't in DISTRO_FEATURES





More information about the Openembedded-commits mailing list