| 1 |
commit: 5cd02da17ef13323aff48dae2d5527396d298211 |
| 2 |
Author: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 3 |
AuthorDate: Wed Jul 18 16:45:30 2012 +0000 |
| 4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 5 |
CommitDate: Wed Jul 18 16:45:30 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=5cd02da1 |
| 7 |
|
| 8 |
util, dodir: catch OSError if dir exists |
| 9 |
|
| 10 |
--- |
| 11 |
roverlay/util.py | 9 +++++++-- |
| 12 |
1 files changed, 7 insertions(+), 2 deletions(-) |
| 13 |
|
| 14 |
diff --git a/roverlay/util.py b/roverlay/util.py |
| 15 |
index 2df4845..3f32646 100644 |
| 16 |
--- a/roverlay/util.py |
| 17 |
+++ b/roverlay/util.py |
| 18 |
@@ -94,11 +94,16 @@ def sysnop ( nop_returns_success=True, format_str=None ): |
| 19 |
# --- end of sysnop (...) --- |
| 20 |
|
| 21 |
def dodir ( directory, mkdir_p=False, **makedirs_kw ): |
| 22 |
- if not os.path.isdir ( directory ): |
| 23 |
+ if os.path.isdir ( directory ): return True |
| 24 |
+ try: |
| 25 |
if mkdir_p: |
| 26 |
os.makedirs ( directory, **makedirs_kw ) |
| 27 |
else: |
| 28 |
os.mkdir ( directory ) |
| 29 |
|
| 30 |
- return True |
| 31 |
+ return True |
| 32 |
+ except Exception as e: |
| 33 |
+ LOGGER.exception ( e ) |
| 34 |
+ return os.path.isdir ( directory ) |
| 35 |
+ |
| 36 |
# --- end of dodir (...) --- |
Archives