From: Yann Dirson <ydirson@altern.org>
Date: Fri, 16 Mar 2007 22:45:44 +0000 (+0000)
Subject: Make use exception raised by removedirs.
X-Git-Tag: v0.13~118
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/c7728cd53216818b3b6e74c3bae9e8c593f6e59e

Make use exception raised by removedirs.

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

diff --git a/stgit/stack.py b/stgit/stack.py
index e9f0e9f..b0ae81e 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):