From d0774baf9acac50d4071c453c9ab62833c79e1e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Metin?= Date: Mon, 18 Jul 2005 22:42:32 +0000 Subject: [PATCH] =?UTF-8?q?derlemeye=20ba=C5=9Flamadan=20=C3=B6nce=20derle?= =?UTF-8?q?me=20dizinini=20temizlemek=20laz=C4=B1m.=20bunun=20i=C3=A7in=20?= =?UTF-8?q?sourcearchive'de=20cleandir=3DTrue=20g=C3=B6nderiyoruz.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pisi/archive.py | 9 ++++----- pisi/sourcearchive.py | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pisi/archive.py b/pisi/archive.py index d31890a4..138cf809 100644 --- a/pisi/archive.py +++ b/pisi/archive.py @@ -22,11 +22,10 @@ class ArchiveBase(object): def unpack(self, targetDir, cleanDir = False): self.targetDir = targetDir # first we check if we need to clean-up our working env. - if os.path.exists(self.targetDir): - if cleanDir: - util.clean_dir(self.targetDir) - else: - os.makedirs(self.targetDir) + if os.path.exists(self.targetDir) and cleanDir: + util.clean_dir(self.targetDir) + + os.makedirs(self.targetDir) class ArchiveTar(ArchiveBase): """ArchiveTar handles tar archives depending on the compression diff --git a/pisi/sourcearchive.py b/pisi/sourcearchive.py index da96ad63..8b1b8ecd 100644 --- a/pisi/sourcearchive.py +++ b/pisi/sourcearchive.py @@ -46,6 +46,6 @@ class SourceArchive: return False - def unpack(self, cleanDir=False): + def unpack(self, cleanDir=True): archive = Archive(self.dest, self.ctx.spec.source.archiveType) archive.unpack(self.ctx.pkg_work_dir(), cleanDir)