diff options
| author | Mark Linimon <linimon@FreeBSD.org> | 2004-05-10 19:27:15 +0000 |
|---|---|---|
| committer | Mark Linimon <linimon@FreeBSD.org> | 2004-05-10 19:27:15 +0000 |
| commit | 8a4b4d2c5ce4047a5a79be647d3eaec3166b5aa0 (patch) | |
| tree | 1f296495c5d690b904d3447b7db386216fb3cf7e /misc/py-pexpect | |
| parent | Upgrade to 2.0b7 and unbreak. (diff) | |
Update to 0.999 and work around buggy getpid() implementations in compiler.
PR: ports/65846
Submitted by: Marco Molteni <mmolteni@cisco.com>
Notes
Notes:
svn path=/head/; revision=108869
Diffstat (limited to 'misc/py-pexpect')
| -rw-r--r-- | misc/py-pexpect/Makefile | 2 | ||||
| -rw-r--r-- | misc/py-pexpect/distinfo | 4 | ||||
| -rw-r--r-- | misc/py-pexpect/files/patch-pexpect.py | 29 |
3 files changed, 32 insertions, 3 deletions
diff --git a/misc/py-pexpect/Makefile b/misc/py-pexpect/Makefile index 9a86b20c3094..5f5ce8321f08 100644 --- a/misc/py-pexpect/Makefile +++ b/misc/py-pexpect/Makefile @@ -7,7 +7,7 @@ # PORTNAME= pexpect -PORTVERSION= 0.99 +PORTVERSION= 0.999 CATEGORIES= misc python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/misc/py-pexpect/distinfo b/misc/py-pexpect/distinfo index c242ce95488a..f874397075b8 100644 --- a/misc/py-pexpect/distinfo +++ b/misc/py-pexpect/distinfo @@ -1,2 +1,2 @@ -MD5 (pexpect-0.99.tgz) = 597081031c64fc58dc9a0dc5bc6c078c -SIZE (pexpect-0.99.tgz) = 19933 +MD5 (pexpect-0.999.tgz) = e426e5f54d323aaf392008c9eb35131d +SIZE (pexpect-0.999.tgz) = 20190 diff --git a/misc/py-pexpect/files/patch-pexpect.py b/misc/py-pexpect/files/patch-pexpect.py new file mode 100644 index 000000000000..37263f96a784 --- /dev/null +++ b/misc/py-pexpect/files/patch-pexpect.py @@ -0,0 +1,29 @@ +--- pexpect.py.orig Mon Apr 26 14:16:08 2004 ++++ pexpect.py Mon Apr 26 14:19:45 2004 +@@ -498,21 +498,24 @@ class spawn: + pid, status = os.waitpid(self.pid, os.WNOHANG) + except OSError: + return 0 + + # I have to do this twice for Solaris. + # I can't even believe that I figured this out... +- if pid == 0 and status == 0: ++ ++ # If waitpid() returns 0 it means that no child process wishes to ++ # report, and the value of status is undefined. ++ if pid == 0: + try: + pid, status = os.waitpid(self.pid, os.WNOHANG) + #print 'Solaris sucks' + except OSError: # This is crufty. When does this happen? + return 0 + # If pid and status is still 0 after two calls to waitpid() then + # the process really is alive. This seems to work on all platforms. +- if pid == 0 and status == 0: ++ if pid == 0: + return 1 + + # I do not OR this together because I want hooks for debugging. + if os.WIFEXITED (status): + self.exitstatus = os.WEXITSTATUS(status) + return 0 |