From c7728cd53216818b3b6e74c3bae9e8c593f6e59e Mon Sep 17 00:00:00 2001
Message-Id: <c7728cd53216818b3b6e74c3bae9e8c593f6e59e.1746655746.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Fri, 16 Mar 2007 22:45:44 +0000
Subject: [PATCH] Make use exception raised by removedirs.
Organization: Straylight/Edgeware

From: Yann Dirson <ydirson@altern.org>

Signed-off-by: Yann Dirson <ydirson@altern.org>
---
 stgit/stack.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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):
-- 
[mdw]