From: Yann Dirson Date: Thu, 15 Mar 2007 00:26:44 GMT Subject: [PATCH 03/10] Make use exception raised by removedirs. Message-ID: <20070315002644.9094.83602.stgit@gandelf.nowhere.earth> In-Reply-To: <20070315001808.9094.68529.stgit@gandelf.nowhere.earth> Signed-off-by: Yann Dirson --- stgit/stack.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stgit/stack.py b/stgit/stack.py index 8fdaf2c..ec75507 100644 --- a/stgit/stack.py +++ b/stgit/stack.py @@ -684,14 +684,14 @@ class Series(StgitObject): else: print 'Patch directory %s is not empty.' % self.__patch_dir - if not os.listdir(self._dir()): + try: os.removedirs(self._dir()) - else: + except OSError: raise StackException, 'Series directory %s is not empty.' % self._dir() - if not os.listdir(self.__refs_dir): + try: os.removedirs(self.__refs_dir) - else: + except OSError: print 'Refs directory %s is not empty.' % self.__refs_dir if os.path.exists(self.__base_file):