3 commits - revisor/__init__.py.in revisor/splittree.py unity/conf

[Jeroen van Meeuwen]

 revisor/__init__.py.in                         |    2 +-
 revisor/splittree.py                           |    4 ++--
 unity/conf/conf.d/fedora-rawhide-single-cd.cfg |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 94d44cef70584a408ad03fceeddc12c883f72bbb
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org&gt;
Date:   Sun Feb 22 02:41:10 2009 +0100

    Fix typo

diff --git a/unity/conf/conf.d/fedora-rawhide-single-cd.cfg
b/unity/conf/conf.d/fedora-rawhide-single-cd.cfg
index f9c1d11..6b7dc15 100644
--- a/unity/conf/conf.d/fedora-rawhide-single-cd.cfg
+++ b/unity/conf/conf.d/fedora-rawhide-single-cd.cfg
@@ -1,3 +1,3 @@
-%packagesv --nobase
+%packages --nobase
 @base --nodefaults
 %end


commit 7a31469d57ca8c243d98d44fd44011731c6bce94
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org&gt;
Date:   Sun Feb 22 02:24:48 2009 +0100

    Workaround from jkeating's pungi for #485167

diff --git a/revisor/splittree.py b/revisor/splittree.py
index 21b0fd5..94d42fd 100755
--- a/revisor/splittree.py
+++ b/revisor/splittree.py
@@ -90,13 +90,13 @@ self.reserve_size : Additional size needed to be reserved on the first
disc.
         """Gets the size as reported by du -sL"""
 
         if blocksize:
-            p = os.popen("du -sL --block-size=1 %s" % path, 'r')
+            p = os.popen("du -slL --block-size=1 %s" % path, 'r')
             thesize = p.read()
             p.close()
             thesize = long(string.split(thesize)[0])
             return thesize
         else:
-            p = os.popen("du -sLh %s" % path, 'r')
+            p = os.popen("du -slLh %s" % path, 'r')
             thesize = p.read()
             p.close()
             thesize = string.split(thesize)[0]


commit e08a90073f19c5e7cfb9703aa0fc3a09c93c6ad5
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org&gt;
Date:   Fri Feb 20 18:52:58 2009 +0100

    Update __init__.py.in to ignore errors on rmtree() when unmounts have failed

diff --git a/revisor/__init__.py.in b/revisor/__init__.py.in
index 4919188..6585844 100644
--- a/revisor/__init__.py.in
+++ b/revisor/__init__.py.in
@@ -516,7 +516,7 @@ class Revisor:
                 # Remove our directories in the working directory
                 for dir in [ "revisor-pungi", "revisor",
"revisor-rundir" ]:
                     if os.access(os.path.join(self.base.cfg.working_directory, dir),
os.R_OK):
-                        shutil.rmtree(os.path.join(self.base.cfg.working_directory,
dir))
+                        shutil.rmtree(os.path.join(self.base.cfg.working_directory, dir),
ignore_errors=True)
 
             if self.base.cfg.clean_up > 1:
                 # Remove everything