Date: Monday, January 19, 2015 @ 20:49:17 Author: arojas Revision: 126245
Add upstream patch to hide exceptions in pexpect, fixes a few test failures Added: sage-mathematics/trunk/pexpect-del.patch Modified: sage-mathematics/trunk/PKGBUILD -------------------+ PKGBUILD | 7 +++++-- pexpect-del.patch | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-01-19 19:48:06 UTC (rev 126244) +++ PKGBUILD 2015-01-19 19:49:17 UTC (rev 126245) @@ -26,7 +26,7 @@ makedepends=('cython2' 'boost' 'scons' 'ratpoints' 'symmetrica' 'fflas-ffpack' 'python2-jinja' 'coin-or-cbc') source=("https://github.com/sagemath/sage/archive/$pkgver.tar.gz" "http://www.sagemath.org/packages/upstream/pexpect/pexpect-2.0.tar.bz2" 'extensions.patch' 'c_lib.patch' 'env.patch' 'paths.patch' 'blas.patch' 'clean.patch' 'skip-check.patch' 'gap-hap.patch' -'pexpect-env.patch' 'fes02.patch') +'pexpect-env.patch' 'pexpect-del.patch' 'fes02.patch') md5sums=('e40736461992e62af3a84cf9a212c9d1' 'd9a3e113ed147dcee8f89962a8dccd43' '5770766ae676491f79162d2062ce7c02' @@ -38,6 +38,7 @@ '5947a420a0b1483f0cbc74c76895789b' '631ee6b8b3e7d12bb7858cfd841af483' 'a83a3b1bc7fcb7cbf752a83a8311fc42' + 'f333939ea6c41377b66407c81016cee4' '506944613082ba7f5b34360939ca90eb') # changelog=ChangeLog @@ -85,9 +86,11 @@ sed -e 's|exec ipython|exec ipython2|' -e 's|cygdb|cygdb2|' -i src/bin/sage sed -e "s|'cython'|'cython2'|" -i src/bin/sage-cython + cd $srcdir/pexpect-2.0 # fix env in pexpect - cd $srcdir/pexpect-2.0 patch -p1 -i $srcdir/pexpect-env.patch +# hide exceptions in pexpect + patch -p1 -i $srcdir/pexpect-del.patch } Added: pexpect-del.patch =================================================================== --- pexpect-del.patch (rev 0) +++ pexpect-del.patch 2015-01-19 19:49:17 UTC (rev 126245) @@ -0,0 +1,15 @@ +diff -ru src/pexpect.py src.del/pexpect.py +--- src/pexpect.py 2005-11-17 15:36:09.000000000 +0100 ++++ src.del/pexpect.py 2012-01-13 10:24:01.000000000 +0100 +@@ -341,7 +341,10 @@ + """ + if self.closed: + return +- self.close() ++ try: ++ self.close() ++ except: ++ pass + + def __str__(self): + """This returns the current state of the pexpect object as a string.