[yum-git] Branch 'yum-3_2_X' - yum/__init__.py

[James Antill]

 yum/__init__.py |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 15166ebb2a71772d1eca2284818b88d10c0091d9
Author: James Antill <james at and.org>
Date:   Mon Jul 28 12:46:27 2008 -0400

    Give more info. when we fail the disk space checks

diff --git a/yum/__init__.py b/yum/__init__.py
index b2dc186..2801fb1 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -53,6 +53,7 @@ from parser import ConfigPreProcessor, varReplace
 import transactioninfo
 import urlgrabber
 from urlgrabber.grabber import URLGrabError
+from urlgrabber.progress import format_number
 from packageSack import packagesNewestByNameArch, packagesNewestByName
 import depsolve
 import plugins
@@ -1103,8 +1104,12 @@ class YumBase(depsolve.Depsolve):
             checkfunc = (self.verifyPkg, (po, 1), {})
             dirstat = os.statvfs(po.repo.pkgdir)
             if (dirstat.f_bavail * dirstat.f_bsize) <= long(po.size):
-                adderror(po, _('Insufficient space in download directory %s '
-                        'to download') % po.repo.pkgdir)
+                adderror(po, _('Insufficient space in download directory %s\n'
+                        "    * free   %s\n"
+                        "    * needed %s") %
+                         (po.repo.pkgdir,
+                          format_number(dirstat.f_bavail * dirstat.f_bsize),
+                          format_number(po.size)))
                 continue
             
             try: