[PATCH 01/10] Fix stack deletion when orig-base is present.

From: Yann Dirson <ydirson@altern.org>
Date: Mar 15, 2007, 00:26 UTC
Message-ID: <20070315002634.9094.6274.stgit@gandelf.nowhere.earth>
In-Reply-To: <20070315001808.9094.68529.stgit@gandelf.nowhere.earth>

The introduction of the orig-base file makes the stack deletion fail to remove the stack's directory, leaving the stack in a zombie state, where attempting to recreate it was refused because of the directory already existing, but attempting to delete it failed since the applied and unapplied files were not found.

Signed-off-by: Yann Dirson <ydirson@altern.org>
---

 stgit/stack.py |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/stgit/stack.py b/stgit/stack.py
index feb77e3..8a63102 100644
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -676,6 +676,8 @@ class Series(StgitObject):
                 os.remove(self.__current_file)
             if os.path.exists(self.__descr_file):
                 os.remove(self.__descr_file)
+            if os.path.exists(self._dir()+'/orig-base'):
+                os.remove(self._dir()+'/orig-base')
             if not os.listdir(self.__patch_dir):
                 os.rmdir(self.__patch_dir)
             else: