[PATCH StGIT] Fix deleting series trash directory
From: Roland Dreier <hidden>
Date: 2016-06-15 22:43:08
Subsystem:
the rest · Maintainer:
Linus Torvalds
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 <redacted> ---
diff --git a/stgit/stack.py b/stgit/stack.py
index b0a01dd..4e5ddb3 100644
--- a/stgit/stack.py
+++ b/stgit/stack.py@@ -665,7 +665,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