[gentoo-commits] proj/layman:master commit in: layman/

["Brian Dolbec" <brian.dolbec@gmail.com>]

commit:     8c0b76134494339ff75bb5c3e8332c69f257838a
Author:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
AuthorDate: Wed Jul  7 00:21:17 2010 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Fri Feb 11 10:46:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=8c0b7613

Add an input parameter, 'output' to delete_empty_directory so that it can be overriden if desired

---
 layman/utils.py |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/layman/utils.py b/layman/utils.py
index 62014d9..18bf442 100644
--- a/layman/utils.py
+++ b/layman/utils.py
@@ -103,20 +103,20 @@ def path(path_elements):
 
     return pathname
 
-def delete_empty_directory(mdir):
+def delete_empty_directory(mdir, output=OUT):
     if os.path.exists(mdir) and not os.listdir(mdir):
         # Check for sufficient privileges
         if os.access(mdir, os.W_OK):
-            OUT.info('Deleting _empty_ directory "%s"' % mdir, 2)
+            output.info('Deleting _empty_ directory "%s"' % mdir, 2)
             try:
                 os.rmdir(mdir)
             except OSError, error:
-                OUT.warn(str(error))
+                output.warn(str(error))
         else:
-            OUT.warn('Insufficient permissions to delete _empty_ folder "%s".' % mdir)
+            output.warn('Insufficient permissions to delete _empty_ folder "%s".' % mdir)
             import getpass
             if getpass.getuser() != 'root':
-                OUT.warn('Hint: You are not root.')
+                output.warn('Hint: You are not root.')
 
 #===============================================================================
 #