git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 03/10] Make use exception raised by removedirs.

From
Yann Dirson <ydirson@altern.org>
Date
Mar 15, 2007, 00:26 UTC
Message-ID
<20070315002644.9094.83602.stgit@gandelf.nowhere.earth>
In-Reply-To
<20070315001808.9094.68529.stgit@gandelf.nowhere.earth>
Signed-off-by: Yann Dirson <ydirson@altern.org>
---
 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):
Previous: Yann DirsonNext: Yann Dirson
Message 4 of 11 in “Various fixes and improvements”
  1. 00/10 Various fixes and improvementsYann Dirson, Mar 15, 2007
  2. 01/10 Fix stack deletion when orig-base is present.Yann Dirson, Mar 15, 2007
  3. 02/10 Fix diagnostic messages on patch deletion and simplify others.Yann Dirson, Mar 15, 2007
  4. 03/10 Make use exception raised by removedirs.Yann Dirson, Mar 15, 2007
  5. 04/10 Drop utils.remove_dirs() in favor of os.removedirs().Yann Dirson, Mar 15, 2007
  6. 05/10 Copy parentbranch setting on 'stg branch --clone'.Yann Dirson, Mar 15, 2007
  7. 06/10 Remove debugging output from contrib/stg-sinkYann Dirson, Mar 15, 2007
  8. 07/10 Stop recording branch.*.remote to '.' for local parents.Yann Dirson, Mar 15, 2007
  9. 08/10 Add a script to quickly run an interactive test session.Yann Dirson, Mar 15, 2007
  10. 09/10 Add support for unsetting config vars.Yann Dirson, Mar 15, 2007
  11. 10/10 Cleanup parent information on stgit branch deletion.Yann Dirson, Mar 15, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.