[yum-commits] urlgrabber/grabber.py

skvidal at osuosl.org skvidal at osuosl.org
Fri Nov 6 20:17:39 UTC 2009


 urlgrabber/grabber.py |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 89cc380a2a251a1d2d8b91cf6df170fa546597aa
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Fri Nov 6 15:16:56 2009 -0500

    if we set a max_size from the header object - don't override it with opts.size
    b/c sometimes a file is smaller than its header :(

diff --git a/urlgrabber/grabber.py b/urlgrabber/grabber.py
index f98f423..7b7f979 100644
--- a/urlgrabber/grabber.py
+++ b/urlgrabber/grabber.py
@@ -1538,9 +1538,11 @@ class PyCurlFileObject():
     def _over_max_size(self, cur, max_size=None):
 
         if not max_size:
-            max_size = self.size
-        if self.opts.size: # if we set an opts size use that, no matter what
-            max_size = self.opts.size
+            if not self.opts.size:
+                max_size = self.size
+            else:
+                max_size = self.opts.size
+
         if not max_size: return False # if we have None for all of the Max then this is dumb
 
         if cur > int(float(max_size) * 1.10):


More information about the Yum-commits mailing list