[SCM] jackd2/master: Don't fail if waflib cannot be removed

adiknoth-guest at users.alioth.debian.org adiknoth-guest at users.alioth.debian.org
Thu Feb 21 17:42:18 UTC 2013


The following commit has been merged in the master branch:
commit 2bad79064f9a8087802baf04c5af9c6a9a83e462
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Thu Feb 21 18:11:51 2013 +0100

    Don't fail if waflib cannot be removed
    
    This is probably only relevant for people who use debcheckout to build
    the package. In this case, patches are not yet applied when
    
       debian/rules clean
    
    is called. Since waflib/ is missing (it's applied from waf.patch), find
    fails and terminates the build process.
    
    This patch ignores any errors from this single find command.

diff --git a/debian/rules b/debian/rules
index c2ae159..d32b45f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,7 +52,7 @@ DEB_MAKE_INSTALL_TARGET = install
 DEB_MAKE_CLEAN_TARGET = clean
 clean::
 	rm -f .lock-wscript .lock-waf_linux2_build
-	find waflib -name "*.pyc" -delete
+	find waflib -name "*.pyc" -delete || true
 	rm -f man/*.1
 	rm -rf build
 

-- 
jackd2 packaging



More information about the pkg-multimedia-commits mailing list