Otherwise it is not possible to delete a stack that never had a patch
deleted (eg. a newborn stack).
Signed-off-by: Yann Dirson <ydirson@xxxxxxxxxx>
---
stgit/stack.py | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/stgit/stack.py b/stgit/stack.py
index 26b0561..30fcca7 100644
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -679,10 +679,11 @@ class Series(StgitObject):
for p in patches:
Patch(p, self.__patch_dir, self.__refs_dir).delete()
- # remove the trash directory
- for fname in os.listdir(self.__trash_dir):
- os.remove(os.path.join(self.__trash_dir, fname))
- os.rmdir(self.__trash_dir)
+ # remove the trash directory if any
+ if os.path.exists(self.__trash_dir):
+ for fname in os.listdir(self.__trash_dir):
+ 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
# (move functionality to StgitObject ?)
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
