summaryrefslogtreecommitdiffstats
path: root/layman/utils.py
diff options
context:
space:
mode:
authorBrian Dolbec <brian.dolbec@gmail.com>2010-07-06 17:21:17 -0700
committerBrian Dolbec <brian.dolbec@gmail.com>2011-02-11 02:46:03 -0800
commit8c0b76134494339ff75bb5c3e8332c69f257838a (patch)
treec478e2abbce932c0fda81bb0f5e82f0458debe22 /layman/utils.py
parent3b6f983f8d764e974c38ae4b4eccbfd63553ff2d (diff)
downloadlayman-8c0b76134494339ff75bb5c3e8332c69f257838a.tar.gz
layman-8c0b76134494339ff75bb5c3e8332c69f257838a.tar.bz2
layman-8c0b76134494339ff75bb5c3e8332c69f257838a.zip
Add an input parameter, 'output' to delete_empty_directory so that it can be overriden if desired
Diffstat (limited to 'layman/utils.py')
-rw-r--r--layman/utils.py10
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.')
#===============================================================================
#