Date: Wednesday, January 20, 2016 @ 16:28:02 Author: arojas Revision: 158313
Drop old patches Modified: sagemath/trunk/PKGBUILD Deleted: sagemath/trunk/pexpect-del.patch sagemath/trunk/pexpect-env.patch -------------------+ PKGBUILD | 4 ++-- pexpect-del.patch | 15 --------------- pexpect-env.patch | 32 -------------------------------- 3 files changed, 2 insertions(+), 49 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-01-20 15:23:35 UTC (rev 158312) +++ PKGBUILD 2016-01-20 15:28:02 UTC (rev 158313) @@ -35,8 +35,8 @@ md5sums=('34807a7cf5dd79c008abd377ba1427fa' 'a906a180d198186a39820b0a2f9a9c63' '9ba81f717ffd4e20b8b2f2a318307488' - 'e1b1d0d2e6b187309ae2b74489356b9a' - 'fd8e3e07f5b7318e6a7200a3c64f5bc2' + '93a9716afa561a928f4fd311582de064' + '10b9fd56538e0141b9cd476ca690aed6' '6d9ae0978ce6a05a0da2cafdfb178a09' '5947a420a0b1483f0cbc74c76895789b' '4eb23a3c7363258bc9ba764d6e5512ba' Deleted: pexpect-del.patch =================================================================== --- pexpect-del.patch 2016-01-20 15:23:35 UTC (rev 158312) +++ pexpect-del.patch 2016-01-20 15:28:02 UTC (rev 158313) @@ -1,15 +0,0 @@ -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. Deleted: pexpect-env.patch =================================================================== --- pexpect-env.patch 2016-01-20 15:23:35 UTC (rev 158312) +++ pexpect-env.patch 2016-01-20 15:28:02 UTC (rev 158313) @@ -1,32 +0,0 @@ -diff -ru src.p4/pexpect.py src.new/pexpect.py ---- src.p4/pexpect.py 2009-01-23 11:01:57.000000000 +0100 -+++ src.new/pexpect.py 2012-01-12 13:38:06.000000000 +0100 -@@ -209,7 +209,7 @@ - Use this class to start and control child applications. - """ - -- def __init__(self, command, args=[], timeout=30, maxread=2000, searchwindowsize=None, logfile=None): -+ def __init__(self, command, args=[], timeout=30, maxread=2000, searchwindowsize=None, logfile=None, env=None): - """This is the constructor. The command parameter may be a string - that includes a command and any arguments to the command. For example: - p = pexpect.spawn ('/usr/bin/ftp') -@@ -302,6 +302,7 @@ - self.child_fd = -1 # initially closed - self.timeout = timeout - self.delimiter = EOF -+ self.env = env - self.logfile = logfile - self.maxread = maxread # Max bytes to read at one time into buffer. - self.buffer = '' # This is the read buffer. See maxread. -@@ -421,7 +422,10 @@ - # (specifically, Tomcat). - signal.signal(signal.SIGHUP, signal.SIG_IGN) - -- os.execv(self.command, self.args) -+ if self.env is None: -+ os.execv(self.command, self.args) -+ else: -+ os.execve(self.command, self.args, self.env) - - # Parent - self.terminated = 0