| 1 |
commit: fbe56d75989fabf29e7b642515df69737cf62cc1 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 9 04:32:08 2021 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 9 04:32:08 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=fbe56d75 |
| 7 |
|
| 8 |
catalyst: Remove clear_dir's never used clear_nondir parameter |
| 9 |
|
| 10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 11 |
|
| 12 |
catalyst/fileops.py | 11 +++-------- |
| 13 |
1 file changed, 3 insertions(+), 8 deletions(-) |
| 14 |
|
| 15 |
diff --git a/catalyst/fileops.py b/catalyst/fileops.py |
| 16 |
index 59525420..4252285e 100644 |
| 17 |
--- a/catalyst/fileops.py |
| 18 |
+++ b/catalyst/fileops.py |
| 19 |
@@ -46,8 +46,7 @@ def ensure_dirs(path, gid=-1, uid=-1, mode=0o755, minimal=True, |
| 20 |
return succeeded |
| 21 |
|
| 22 |
|
| 23 |
-def clear_dir(target, mode=0o755, remove=False, |
| 24 |
- clear_nondir=True): |
| 25 |
+def clear_dir(target, mode=0o755, remove=False): |
| 26 |
'''Universal directory clearing function |
| 27 |
|
| 28 |
@target: string, path to be cleared or removed |
| 29 |
@@ -74,12 +73,8 @@ def clear_dir(target, mode=0o755, remove=False, |
| 30 |
log.error('clear_dir failed', exc_info=True) |
| 31 |
return False |
| 32 |
elif os.path.exists(target): |
| 33 |
- if clear_nondir: |
| 34 |
- log.debug("Clearing (unlinking) non-directory: %s", target) |
| 35 |
- os.unlink(target) |
| 36 |
- else: |
| 37 |
- log.info('clear_dir failed: %s: is not a directory', target) |
| 38 |
- return False |
| 39 |
+ log.debug("Clearing (unlinking) non-directory: %s", target) |
| 40 |
+ os.unlink(target) |
| 41 |
else: |
| 42 |
log.debug("Conditions not met to clear: %s", target) |
| 43 |
log.debug(" isdir: %s", os.path.isdir(target)) |
Archives