diff options
| author |   Rob Cakebread <pythonhead@gentoo.org> | 2005-06-09 16:22:50 +0000 |
|---|---|---|
| committer | Rob Cakebread <pythonhead@gentoo.org> | 2005-06-09 16:22:50 +0000 |
| commit | 1fa04645c0f58be78b584fee0ca24b4bd5b5f240 (patch) | |
| tree | c4d2f07ac76ca352d008a2c7c4febb326f525d11 /net-misc/fsh/files | |
| parent | Added testing livecd-tools 1.0.21_pre3 version. (diff) | |
| download | gentoo-2-1fa04645c0f58be78b584fee0ca24b4bd5b5f240.tar.gz gentoo-2-1fa04645c0f58be78b584fee0ca24b4bd5b5f240.tar.bz2 gentoo-2-1fa04645c0f58be78b584fee0ca24b4bd5b5f240.zip | |
Fixed FCNTL problem with Python 2.4 bug# 95533
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'net-misc/fsh/files')
| -rw-r--r-- | net-misc/fsh/files/digest-fsh-1.2-r2 | 1 | ||||
| -rw-r--r-- | net-misc/fsh/files/fsh-1.2-gentoo-fcntl.patch | 37 |
2 files changed, 38 insertions, 0 deletions
diff --git a/net-misc/fsh/files/digest-fsh-1.2-r2 b/net-misc/fsh/files/digest-fsh-1.2-r2 new file mode 100644 index 000000000000..1b2164e12be6 --- /dev/null +++ b/net-misc/fsh/files/digest-fsh-1.2-r2 @@ -0,0 +1 @@ +MD5 74d7fc65044d1c9c27c6e9edbbde9c68 fsh-1.2.tar.gz 152374 diff --git a/net-misc/fsh/files/fsh-1.2-gentoo-fcntl.patch b/net-misc/fsh/files/fsh-1.2-gentoo-fcntl.patch new file mode 100644 index 000000000000..4c76c9fe43c6 --- /dev/null +++ b/net-misc/fsh/files/fsh-1.2-gentoo-fcntl.patch @@ -0,0 +1,37 @@ +--- fsh-1.2/fshcompat.py.orig 2001-12-23 22:08:26.000000000 +1100 ++++ fsh-1.2/fshcompat.py +@@ -52,20 +52,23 @@ except: + # in Python 2.2 as a bug. See <URL:http://sourceforge.net/tracker/ + # ?func=detail&aid=496171&group_id=5470&atid=105470>. + try: +- # Stop Python 2.2 from warning that we import a deprecated module. +- # But Python 1.5.2 doesn't have the warnings module, so be prepared +- # for the import statement to fail. + try: +- import warnings +- warnings.filterwarnings( +- "ignore", +- "the FCNTL module is deprecated; please use fcntl", +- DeprecationWarning) +- except ImportError: +- pass ++ FD_CLOEXEC = fcntl.FD_CLOEXEC ++ except: ++ # Stop Python 2.2 from warning that we import a deprecated module. ++ # But Python 1.5.2 doesn't have the warnings module, so be prepared ++ # for the import statement to fail. ++ try: ++ import warnings ++ warnings.filterwarnings( ++ "ignore", ++ "the FCNTL module is deprecated; please use fcntl", ++ DeprecationWarning) ++ except ImportError: ++ pass + +- import FCNTL +- FD_CLOEXEC = FCNTL.FD_CLOEXEC ++ import FCNTL ++ FD_CLOEXEC = FCNTL.FD_CLOEXEC + + except AttributeError: |