From 89fcb110afa601bdb97f07c4100fce25b2efd6d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eray=20=C3=96zkural?= <eray@pardus.org.tr>
Date: Fri, 24 Jun 2005 16:04:12 +0000
Subject: [PATCH] * install'u erken kes, bug'i gormek icin, her zaman output
 dir'i temizlemeye calisma, aman diyeyim

---
 pisi/archive.py | 8 +++++---
 pisi/install.py | 3 +++
 pisi/util.py    | 2 --
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pisi/archive.py b/pisi/archive.py
index 4abb521f..cf360a35 100644
--- a/pisi/archive.py
+++ b/pisi/archive.py
@@ -21,11 +21,12 @@ class ArchiveBase(object):
         self.filePath = filepath
         self.type = atype
 
-    def unpack(self, targetDir):
+    def unpack(self, targetDir, cleanDir=True):
         self.targetDir = targetDir
         # first we check if we need to clean-up our working env.
         if os.path.exists(self.targetDir):
-            util.clean_dir(self.targetDir)
+            if cleanDir:
+                util.clean_dir(self.targetDir)
         else:
             os.makedirs(self.targetDir)
 
@@ -108,7 +109,7 @@ class ArchiveZip(ArchiveBase):
     def unpack_file_cond(self, pred, targetDir, archiveRoot=''):
         """Unpack/Extract a file according to predicate function filename ->
         bool"""
-        super(ArchiveZip, self).unpack(targetDir)
+        super(ArchiveZip, self).unpack(targetDir, False)
         zip = self.zip
         for fileName in zip.namelist():
             if pred(fileName):   # check if condition holds
@@ -121,6 +122,7 @@ class ArchiveZip(ArchiveBase):
                         fileName = util.removepathprefix(archiveRoot, fileName)
                         print '*', fileName
                     else:
+                        
                         continue        # don't extract if not under
                 ofile = os.path.join(targetDir, fileName)
                 print 'ofile ', ofile
diff --git a/pisi/install.py b/pisi/install.py
index f095cce2..b3b9e2f4 100644
--- a/pisi/install.py
+++ b/pisi/install.py
@@ -27,6 +27,9 @@ def install(package_fn):
     util.clean_dir(config.install_dir())
     package.extract_PISI_files(config.install_dir())
 
+    import sys
+    sys.exit(1)
+
     # verify package
     # check if we have all required files
 
diff --git a/pisi/util.py b/pisi/util.py
index 46f2a0e7..2d0efff4 100644
--- a/pisi/util.py
+++ b/pisi/util.py
@@ -49,11 +49,9 @@ def same(l):
 
 def prefix(a, b):
     "check if sequence a is a prefix of sequence b"
-    print 'PREFIX', a, b
     if len(a)>len(b):
         return False
     for i in range(0,len(a)):
-        print 'checking', a[i], b[i]
         if a[i]!=b[i]:
             return False
     return True