From 90b32bf90f963422746602b2b4e9d97f4bcaa33e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Metin?= Date: Tue, 14 Jun 2005 13:21:07 +0000 Subject: [PATCH] =?UTF-8?q?unittest=20bir=20bug=20daha=20yakalad=C4=B1=20:?= =?UTF-8?q?).=20e=C4=9Fer=20olu=C5=9Fturulmak=20istenen=20dizin=20varsa=20?= =?UTF-8?q?=C3=A7ak=C4=B1l=C4=B1yorduk.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pisi/archive.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/pisi/archive.py b/src/pisi/archive.py index 0dc71fba..84152269 100644 --- a/src/pisi/archive.py +++ b/src/pisi/archive.py @@ -3,7 +3,8 @@ # maintainer baris and meren #standart lisbrary modules -import os, sys +import os +import sys import tarfile import zipfile @@ -15,13 +16,15 @@ class ArchiveBase(object): self.type = type self.fileName = fileName + self.filePath = config.archives_dir() + '/' + self.fileName + class ArchiveTarFile(ArchiveBase): def __init__(self, fileName, type): super(ArchiveTarFile, self).__init__(fileName, type) def unpack(self): if self.type == 'targz': - tar = tarfile.open(config.archives_dir() + '/' + self.fileName, 'r:gz') + tar = tarfile.open(self.filePath, 'r:gz') for tarinfo in tar: tar.extract(tarinfo) tar.close() @@ -31,13 +34,15 @@ class ArchiveZip(ArchiveBase): super(ArchiveZip, self).__init__(fileName, type) def unpack(self): - zip = zipfile.ZipFile(config.archives_dir() + '/' + self.fileName, 'r') + zip = zipfile.ZipFile(self.filePath, 'r') fileNames = zip.namelist() for file in fileNames: ofile = config.archives_dir() + '/' + file if not os.path.exists(os.path.dirname(config.archives_dir() + '/' + file)): os.mkdir(os.path.dirname(config.archives_dir() + '/' + file)) continue + else: # directory is present, we should still continue (or delete?) + continue buff = open (ofile, 'wb') fileContent = zip.read(file) buff.write(fileContent)