summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--combox/file.py1
2 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5e5b4ba..4515ff8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@
already exist.
* setup.py: added function for reading a file; we don't use the
read_file function from combox.file module anymore.
+ * combox/file.py (rm_path): rm_path function, if it is given a
+ directory, purges it first before deleting it.
2016-01-10 Siddharth Ravikumar <sravik@bgsu.edu>
diff --git a/combox/file.py b/combox/file.py
index 08f7ccf..cbbce9c 100644
--- a/combox/file.py
+++ b/combox/file.py
@@ -225,6 +225,7 @@ def rm_path(fpath):
if path.isfile(fpath):
os.remove(fpath)
elif path.isdir(fpath):
+ purge_dir(fpath)
os.rmdir(fpath)
except OSError, e:
log_e("Error when trying to remove path %s" % fpath)