From 0c9aeacf7bcb95e27a61a4f52faa9f83a46a4c36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0smail=20D=C3=B6nmez?= Date: Sat, 2 Feb 2008 06:03:53 +0000 Subject: [PATCH] remove patch --- python-2.5.patch | 38 -------------------------------------- 1 file changed, 38 deletions(-) delete mode 100644 python-2.5.patch diff --git a/python-2.5.patch b/python-2.5.patch deleted file mode 100644 index 3e161027..00000000 --- a/python-2.5.patch +++ /dev/null @@ -1,38 +0,0 @@ -Index: pisi/archive.py -=================================================================== ---- pisi/archive.py (revision 16476) -+++ pisi/archive.py (working copy) -@@ -19,6 +19,7 @@ - import tarfile - import zipfile - import gzip -+import struct - - import gettext - __trans = gettext.translation('pisi', fallback=True) -@@ -212,8 +213,24 @@ - "Attempt to read ZIP archive that was already closed" - zinfo = self.getinfo(name) - filepos = self.fp.tell() -- self.fp.seek(zinfo.file_offset, 0) - -+ self.fp.seek(zinfo.header_offset, 0) -+ -+ # Skip the file header: -+ fheader = self.fp.read(30) -+ if fheader[0:4] != zipfile.stringFileHeader: -+ raise BadZipfile, "Bad magic number for file header" -+ -+ fheader = struct.unpack(zipfile.structFileHeader, fheader) -+ fname = self.fp.read(fheader[zipfile._FH_FILENAME_LENGTH]) -+ if fheader[zipfile._FH_EXTRA_FIELD_LENGTH]: -+ self.fp.read(fheader[zipfile._FH_EXTRA_FIELD_LENGTH]) -+ -+ if fname != zinfo.orig_filename: -+ raise zipfile.BadZipfile, \ -+ 'File name in directory "%s" and header "%s" differ.' % ( -+ zinfo.orig_filename, fname) -+ - destfile = file(outname, 'wb') - - if zinfo.compress_type == zipfile.ZIP_STORED: