View | Details | Raw Unified | Return to bug 98927
Collapse All | Expand All

(-)py-pexpect/Makefile (-4 / +4 lines)
Lines 7-20 Link Here
7
#
7
#
8
8
9
PORTNAME=	pexpect
9
PORTNAME=	pexpect
10
PORTVERSION=	0.999
10
PORTVERSION=	2.1
11
CATEGORIES=	misc python
11
CATEGORIES=	misc python
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
13
		http://dryice.name/computer/FreeBSD/distfiles/
13
MASTER_SITE_SUBDIR=	${PORTNAME}
14
MASTER_SITE_SUBDIR=	${PORTNAME}
14
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
15
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
15
EXTRACT_SUFX=	.tgz
16
16
17
MAINTAINER=	ports@FreeBSD.org
17
MAINTAINER=	dryice@dryice.name
18
COMMENT=	A Pure Python Expect-like module
18
COMMENT=	A Pure Python Expect-like module
19
19
20
USE_PYTHON=	yes
20
USE_PYTHON=	yes
(-)py-pexpect/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (pexpect-0.999.tgz) = e426e5f54d323aaf392008c9eb35131d
1
MD5 (pexpect-2.1.tar.gz) = fd3d67ac085332f074cd665424dcd631
2
SHA256 (pexpect-0.999.tgz) = 9f0394104d299c1d544b278c22be6cb169c52421257c6a78a0fbdb590f9fd688
2
SHA256 (pexpect-2.1.tar.gz) = d986dcbd954435e0ba78aaef391106c71a9b548a1cbd29cfb4eec3cb8c841313
3
SIZE (pexpect-0.999.tgz) = 20190
3
SIZE (pexpect-2.1.tar.gz) = 116478
(-)py-pexpect/files/patch-pexpect.py (-29 lines)
Lines 1-29 Link Here
1
--- pexpect.py.orig	Mon Apr 26 14:16:08 2004
2
+++ pexpect.py	Mon Apr 26 14:19:45 2004
3
@@ -498,21 +498,24 @@ class spawn:
4
             pid, status = os.waitpid(self.pid, os.WNOHANG)
5
         except OSError:
6
             return 0
7
 
8
         # I have to do this twice for Solaris.
9
         # I can't even believe that I figured this out...
10
-        if pid == 0 and status == 0:
11
+
12
+        # If waitpid() returns 0 it means that no child process wishes to
13
+        # report, and the value of status is undefined.
14
+        if pid == 0:
15
             try:
16
                 pid, status = os.waitpid(self.pid, os.WNOHANG)
17
                 #print 'Solaris sucks'
18
             except OSError: # This is crufty. When does this happen?
19
                 return 0
20
             # If pid and status is still 0 after two calls to waitpid() then
21
             # the process really is alive. This seems to work on all platforms.
22
-            if pid == 0 and status == 0:
23
+            if pid == 0:
24
                 return 1
25
 
26
         # I do not OR this together because I want hooks for debugging.
27
         if os.WIFEXITED (status):
28
             self.exitstatus = os.WEXITSTATUS(status)
29
             return 0
(-)py-pexpect/pkg-plist (+6 lines)
Lines 1-3 Link Here
1
%%PYTHON_SITELIBDIR%%/fdpexpect.py
2
%%PYTHON_SITELIBDIR%%/fdpexpect.pyc
3
%%PYTHON_SITELIBDIR%%/fdpexpect.pyo
1
%%PYTHON_SITELIBDIR%%/pexpect.py
4
%%PYTHON_SITELIBDIR%%/pexpect.py
2
%%PYTHON_SITELIBDIR%%/pexpect.pyc
5
%%PYTHON_SITELIBDIR%%/pexpect.pyc
3
%%PYTHON_SITELIBDIR%%/pexpect.pyo
6
%%PYTHON_SITELIBDIR%%/pexpect.pyo
7
%%PYTHON_SITELIBDIR%%/pxssh.py
8
%%PYTHON_SITELIBDIR%%/pxssh.pyc
9
%%PYTHON_SITELIBDIR%%/pxssh.pyo

Return to bug 98927