Patchwork [meta-oe,10/11] iotop: don't fail when site.py* does not exist

login
register
mail settings
Submitter Martin Jansa
Date Dec. 13, 2012, 10:41 p.m.
Message ID <f52405e70b3fb592693d39bc416051de9180c3b3.1355438402.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/40941/
State Accepted
Commit def33b5a819276057a047713de05475e792f5a18
Headers show

Comments

Martin Jansa - Dec. 13, 2012, 10:41 p.m.
* also remove usr/share/share removal, it's taken care of in distutils.bbclass now

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-extended/iotop/iotop_0.4.4.bb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Patch

diff --git a/meta-oe/recipes-extended/iotop/iotop_0.4.4.bb b/meta-oe/recipes-extended/iotop/iotop_0.4.4.bb
index 8be41af..3b8150b 100644
--- a/meta-oe/recipes-extended/iotop/iotop_0.4.4.bb
+++ b/meta-oe/recipes-extended/iotop/iotop_0.4.4.bb
@@ -4,6 +4,8 @@  DESCRIPTION = "iotop does for I/O usage what top(1) does for CPU usage. \
  a table of current I/O usage by processes on the system."
 HOMEPAGE = "http://guichaz.free.fr/iotop/"
 
+PR = "r1"
+
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4"
 
@@ -14,9 +16,8 @@  SRC_URI[sha256sum] = "46f3279fb1a7dfc129b5d00950c6e8389e4aedeb58880e848b88d68648
 inherit distutils
 
 do_install_append() {
-	rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.pyo
-	rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py
-	[ -d ${D}${datadir}/share ] && rmdir ${D}${datadir}/share
+	rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.pyo || true
+	rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py  || true
 }
 
 RDEPENDS_${PN} = "python-distutils python-curses python-textutils \