Correct algorithm to caculate download packages size

diff --git a/plugins/backend/yumpkgmgr.py b/plugins/backend/yumpkgmgr.py
index 08687b4522d02795f0ede31cf4a8c13f63a47cc3..9a259b82873c29b1736279fd7d6518097cf536be 100644 (file)
--- a/plugins/backend/yumpkgmgr.py
+++ b/plugins/backend/yumpkgmgr.py
@@ -280,20 +280,25 @@ class Yum(BackendPlugin, yum.YumBase):
 
         total_count = len(dlpkgs)
         cached_count = 0
-        download_total_size = 0L
+        download_total_size = sum(map(lambda x: int(x.packagesize), dlpkgs))
         msger.info("\nChecking packages cache and packages integrity ...")
         for po in dlpkgs:
             local = po.localPkg()
             if not os.path.exists(local):
                 continue
             if not self.verifyPkg(local, po, False):
-                download_total_size += po.downloadSize()
                 msger.warning("Package %s is damaged: %s" % (os.path.basename(local), local))
             else:
+                download_total_size -= int(po.packagesize)
                 cached_count +=1
 
         # record the total size of installed pkgs
-        pkgs_total_size = sum(map(lambda x: int(x.size), dlpkgs))
+        pkgs_total_size = 0L
+        for x in dlpkgs:
+            if hasattr(x, 'installedsize'):
+                pkgs_total_size += int(x.installedsize)
+            else:
+                pkgs_total_size += int(x.size)
 
         # check needed size before actually download and install
         if checksize and pkgs_total_size + download_total_size > checksize:

diff --git a/plugins/backend/zypppkgmgr.py b/plugins/backend/zypppkgmgr.py
index d5383959babdc60f16ecf57d4b4b47d1c8e666d2..e46a678eb6ee5698e9524c805068d76773e9563d 100644 (file)
--- a/plugins/backend/zypppkgmgr.py
+++ b/plugins/backend/zypppkgmgr.py
@@ -351,7 +351,7 @@ class Zypp(BackendPlugin):
 
         total_count = len(dlpkgs)
         cached_count = 0
-        download_total_size = 0L
+        download_total_size = sum(map(lambda x: int(x.downloadSize()), dlpkgs))
         localpkgs = self.localpkgs.keys()
         msger.info("Checking packages cache and packages integrity ...")
         for po in dlpkgs:
@@ -362,9 +362,9 @@ class Zypp(BackendPlugin):
                 local = self.getLocalPkgPath(po)
                 if os.path.exists(local):
                     if self.checkPkg(local) != 0:
-                        download_total_size += po.downloadSize()
                         os.unlink(local)
                     else:
+                        download_total_size -= int(po.downloadSize())
                         cached_count += 1
 
         # record the total size of installed pkgs