remove ve removeDir için glob desteği...

This commit is contained in:
S.Çağlar Onur
2005-08-25 14:20:45 +00:00
parent 8f852f42b7
commit 8a997dd182
2 changed files with 11 additions and 5 deletions
+4 -2
View File
@@ -211,8 +211,10 @@ def newman(sourceFile, destinationFile):
def remove(sourceFile): def remove(sourceFile):
'''removes sourceFile''' '''removes sourceFile'''
unlink(get.installDIR() + sourceFile) for file in glob.glob(get.installDIR() + sourceFile):
unlink(file)
def removeDir(destinationDirectory): def removeDir(destinationDirectory):
'''removes destinationDirectory and its subtrees''' '''removes destinationDirectory and its subtrees'''
unlinkDir(get.installDIR() + destinationDirectory) for directory in glob.glob(get.installDIR() + destinationDirectory):
unlinkDir(directory)
+7 -3
View File
@@ -72,6 +72,8 @@ def unlink(sourceFile):
os.unlink(sourceFile) os.unlink(sourceFile)
except OSError: except OSError:
ui.error('\n!!! ActionsAPI [unlink]: Permission denied...\n') ui.error('\n!!! ActionsAPI [unlink]: Permission denied...\n')
elif isDirectory(sourceFile):
pass
else: else:
ui.error('\n!!! ActionsAPI [unlink]: File doesn\'t exists...\n') ui.error('\n!!! ActionsAPI [unlink]: File doesn\'t exists...\n')
@@ -82,8 +84,10 @@ def unlinkDir(sourceDirectory):
shutil.rmtree(sourceDirectory) shutil.rmtree(sourceDirectory)
except OSError: except OSError:
ui.error('\n!!! ActionsAPI [unlinkDir]: Operation not permitted...\n') ui.error('\n!!! ActionsAPI [unlinkDir]: Operation not permitted...\n')
elif isFile(sourceDirectory):
pass
else: 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): def move(sourceFile, destinationFile):
'''recursively move a sourceFile or directory to 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 True if sourceFile is an existing regular file'''
return os.path.isfile(sourceFile) return os.path.isfile(sourceFile)
def isDirectory(sourceFile): def isDirectory(sourceDirectory):
'''Return True if sourceFile is an existing directory''' '''Return True if sourceFile is an existing directory'''
return os.path.isdir(sourceFile) return os.path.isdir(sourceDirectory)
def realPath(sourceFile): def realPath(sourceFile):
'''return the canonical path of the specified filename, eliminating any symbolic links encountered in the path''' '''return the canonical path of the specified filename, eliminating any symbolic links encountered in the path'''