| 1 |
commit: 4ec06a0babf271b1664d1850ebcd75a05d4e3599 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 7 04:47:40 2012 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Thu Jun 7 04:47:40 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=4ec06a0b |
| 7 |
|
| 8 |
fix a missed update from the old OUT variable usage. |
| 9 |
|
| 10 |
--- |
| 11 |
layman/utils.py | 8 ++++++-- |
| 12 |
1 files changed, 6 insertions(+), 2 deletions(-) |
| 13 |
|
| 14 |
diff --git a/layman/utils.py b/layman/utils.py |
| 15 |
index 9ffdda0..7cfdaef 100644 |
| 16 |
--- a/layman/utils.py |
| 17 |
+++ b/layman/utils.py |
| 18 |
@@ -34,7 +34,7 @@ import sys |
| 19 |
import locale |
| 20 |
import codecs |
| 21 |
|
| 22 |
-from layman.debug import OUT |
| 23 |
+from layman.output import Message |
| 24 |
|
| 25 |
|
| 26 |
#=============================================================================== |
| 27 |
@@ -163,7 +163,11 @@ def path(path_elements): |
| 28 |
|
| 29 |
return pathname |
| 30 |
|
| 31 |
-def delete_empty_directory(mdir, output=OUT): |
| 32 |
+def delete_empty_directory(mdir, output=None): |
| 33 |
+ # test for a usable output parameter, |
| 34 |
+ # and make it usable if not |
| 35 |
+ if output is None: |
| 36 |
+ output = Message() |
| 37 |
if os.path.exists(mdir) and not os.listdir(mdir): |
| 38 |
# Check for sufficient privileges |
| 39 |
if os.access(mdir, os.W_OK): |
Archives