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 e9f0e9f0bb88e5af873db49baf3ee833c7a23489..b0ae81ed561cfa587933fb81e258467b7759fbbb 100644 (file)
--- 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
 
             else:
                 print 'Patch directory %s is not empty.' % self.__patch_dir
 

-            if not os.listdir(self._dir()):
+            try:

                 os.removedirs(self._dir())
                 os.removedirs(self._dir())

-            else:
+            except OSError:

                 raise StackException, 'Series directory %s is not empty.' % self._dir()
 
                 raise StackException, 'Series directory %s is not empty.' % self._dir()
 

-            if not os.listdir(self.__refs_dir):
+            try:

                 os.removedirs(self.__refs_dir)
                 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):
                 print 'Refs directory %s is not empty.' % self.__refs_dir
 
         if os.path.exists(self.__base_file):