From 8a997dd18297c67885f84ebb747bce0f20790417 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= <caglar@pardus.org.tr>
Date: Thu, 25 Aug 2005 14:20:45 +0000
Subject: [PATCH] =?UTF-8?q?remove=20ve=20removeDir=20i=C3=A7in=20glob=20de?=
 =?UTF-8?q?ste=C4=9Fi...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pisi/actionsapi/pisitools.py  |  6 ++++--
 pisi/actionsapi/shelltools.py | 10 +++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pisi/actionsapi/pisitools.py b/pisi/actionsapi/pisitools.py
index 49bf739c..a29af0ed 100644
--- a/pisi/actionsapi/pisitools.py
+++ b/pisi/actionsapi/pisitools.py
@@ -211,8 +211,10 @@ def newman(sourceFile, destinationFile):
 
 def remove(sourceFile):
     '''removes sourceFile'''
-    unlink(get.installDIR() + sourceFile)
+    for file in glob.glob(get.installDIR() + sourceFile):
+        unlink(file)
 
 def removeDir(destinationDirectory):
     '''removes destinationDirectory and its subtrees'''
-    unlinkDir(get.installDIR() + destinationDirectory)
+    for directory in glob.glob(get.installDIR() + destinationDirectory):
+        unlinkDir(directory)
diff --git a/pisi/actionsapi/shelltools.py b/pisi/actionsapi/shelltools.py
index 37b02fd9..4c0c3bc8 100644
--- a/pisi/actionsapi/shelltools.py
+++ b/pisi/actionsapi/shelltools.py
@@ -72,6 +72,8 @@ def unlink(sourceFile):
             os.unlink(sourceFile)
         except OSError:
             ui.error('\n!!! ActionsAPI [unlink]: Permission denied...\n')
+    elif isDirectory(sourceFile):
+        pass
     else:
         ui.error('\n!!! ActionsAPI [unlink]: File doesn\'t exists...\n')
 
@@ -82,8 +84,10 @@ def unlinkDir(sourceDirectory):
             shutil.rmtree(sourceDirectory)
         except OSError:
             ui.error('\n!!! ActionsAPI [unlinkDir]: Operation not permitted...\n')
+    elif isFile(sourceDirectory):
+        pass                                
     else:
-        ui.error('\n!!! ActionsAPI [unlinkDir]: File doesn\'t exists...\n')
+        ui.error('\n!!! ActionsAPI [unlinkDir]: Directory doesn\'t exists...\n')
 
 def move(sourceFile, destinationFile):
     '''recursively move a sourceFile or directory to destinationFile'''
@@ -156,9 +160,9 @@ def isFile(sourceFile):
     '''return True if sourceFile is an existing regular file'''
     return os.path.isfile(sourceFile)
 
-def isDirectory(sourceFile):
+def isDirectory(sourceDirectory):
     '''Return True if sourceFile is an existing directory'''
-    return os.path.isdir(sourceFile)
+    return os.path.isdir(sourceDirectory)
 
 def realPath(sourceFile):
     '''return the canonical path of the specified filename, eliminating any symbolic links encountered in the path'''