From f9072c2fa274a7378080102b434c0563c77e4b1b Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Fri, 16 Mar 2007 22:45:43 +0000 Subject: [PATCH] Fix stack deletion when orig-base is present. Organization: Straylight/Edgeware From: Yann Dirson 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 --- stgit/stack.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stgit/stack.py b/stgit/stack.py index 9dd5ec7..12110aa 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: -- [mdw]