Also make use standard os.removedirs(), allowing for the same
simplification.
Signed-off-by: Yann Dirson <ydirson@xxxxxxxxxx>
---
stgit/stack.py | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/stgit/stack.py b/stgit/stack.py
index 8a63102..8fdaf2c 100644
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -571,7 +571,7 @@ class Series(StgitObject):
os.rmdir(self.__patch_dir)
print 'done'
else:
- print 'Patch directory %s is not empty.' % self.__name
+ print 'Patch directory %s is not empty.' % self.__patch_dir
self.__patch_dir = self._dir()
@@ -678,18 +678,19 @@ class Series(StgitObject):
os.remove(self.__descr_file)
if os.path.exists(self._dir()+'/orig-base'):
os.remove(self._dir()+'/orig-base')
+
if not os.listdir(self.__patch_dir):
os.rmdir(self.__patch_dir)
else:
- print 'Patch directory %s is not empty.' % self.__name
+ print 'Patch directory %s is not empty.' % self.__patch_dir
+
if not os.listdir(self._dir()):
- remove_dirs(os.path.join(self.__base_dir, 'patches'),
- self.__name)
+ os.removedirs(self._dir())
else:
- print 'Series directory %s is not empty.' % self.__name
+ raise StackException, 'Series directory %s is not empty.' % self._dir()
+
if not os.listdir(self.__refs_dir):
- remove_dirs(os.path.join(self.__base_dir, 'refs', 'patches'),
- self.__name)
+ os.removedirs(self.__refs_dir)
else:
print 'Refs directory %s is not empty.' % self.__refs_dir
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html