From: Roland Dreier <rdreier@cisco.com>
Date: Thu, 3 May 2007 18:29:41 +0000 (-0700)
Subject: Fix deleting series trash directory
X-Git-Tag: v0.14.3~266
X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/commitdiff_plain/84d00348353386756de38c08e5c17013faa83de7

Fix deleting series trash directory

When deleting a series, the loop that iterates through the files in
__trash_dir needs to add __trash_dir to the filename that it passes to
os.remove().

Signed-off-by: Roland Dreier <rolandd@cisco.com>
---

diff --git a/stgit/stack.py b/stgit/stack.py
index 2477ac6..0cf7947 100644
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -639,7 +639,7 @@ class Series(StgitObject):
 
             # remove the trash directory
             for fname in os.listdir(self.__trash_dir):
-                os.remove(fname)
+                os.remove(os.path.join(self.__trash_dir, fname))
             os.rmdir(self.__trash_dir)
 
             # FIXME: find a way to get rid of those manual removals