diff options
author | Jeremy Katz <katzj@redhat.com> | 2008-02-13 12:27:14 -0500 |
---|---|---|
committer | Jeremy Katz <katzj@redhat.com> | 2008-02-14 17:07:32 -0500 |
commit | 7ca020b1dccf4a3103d0543b626948fd08b6a93b (patch) | |
tree | 9363c71dad75e23bd3db424a1054b4bf0fac7013 /scripts/upd-instroot | |
parent | 75e45ce77df407d298f66bbee20b728ac6ceacd2 (diff) | |
download | anaconda-7ca020b1dccf4a3103d0543b626948fd08b6a93b.tar.gz anaconda-7ca020b1dccf4a3103d0543b626948fd08b6a93b.tar.xz anaconda-7ca020b1dccf4a3103d0543b626948fd08b6a93b.zip |
Stop forcing passive mode for FTP by patching urllib
If we really need passive mode for installs, let's just set it properly
Diffstat (limited to 'scripts/upd-instroot')
-rwxr-xr-x | scripts/upd-instroot | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/scripts/upd-instroot b/scripts/upd-instroot index eabfd7369..72d0e7728 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -1128,31 +1128,6 @@ for p in $DEST $DESTGR ; do mkdir -p $p/usr/src/debug done -echo "Patching python library..." - -# always use passive mode for ftp installs -cd $DEST/usr/$LIBDIR/python* -patch -p0 > /dev/null <<EOF ---- urllib.py.orig Thu Oct 25 17:05:06 2001 -+++ urllib.py Thu Oct 25 17:05:34 2001 -@@ -453,6 +453,7 @@ - path, attrs = splitattr(path) - path = unquote(path) - dirs = path.split('/') -+ dirs[0] = '/' + dirs[0] - dirs, file = dirs[:-1], dirs[-1] - if dirs and not dirs[0]: dirs = dirs[1:] - if dirs and not dirs[0]: dirs[0] = '/' -@@ -707,6 +708,7 @@ - self.ftp = ftplib.FTP() - self.ftp.connect(self.host, self.port) - self.ftp.login(self.user, self.passwd) -+ self.ftp.set_pasv(1) - for dir in self.dirs: - self.ftp.cwd(dir) -EOF -cd - - for p in $DEST $DESTGR; do find $p -name "*.py" | while read fn; do rm -f ${fn}o |