From owner-svn-ports-head@FreeBSD.ORG Mon Jul 16 08:51:23 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A39121065688; Mon, 16 Jul 2012 08:51:23 +0000 (UTC) (envelope-from nivit@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 841658FC0C; Mon, 16 Jul 2012 08:51:23 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6G8pNNn021923; Mon, 16 Jul 2012 08:51:23 GMT (envelope-from nivit@svn.freebsd.org) Received: (from nivit@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6G8pNjx021920; Mon, 16 Jul 2012 08:51:23 GMT (envelope-from nivit@svn.freebsd.org) Message-Id: <201207160851.q6G8pNjx021920@svn.freebsd.org> From: Nicola Vitale Date: Mon, 16 Jul 2012 08:51:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r300931 - in head/www/py-urlgrabber: . files X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Jul 2012 08:51:23 -0000 Author: nivit Date: Mon Jul 16 08:51:22 2012 New Revision: 300931 URL: http://svn.freebsd.org/changeset/ports/300931 Log: - Add a patch (provided by the authors of the program: goo.gl/jorPS ) to fix a bug with the size of PyCurlFileObject - Bump PORTREVISION PR: ports/168917 Submitted by: Anders F Bjoerklund Added: head/www/py-urlgrabber/files/patch-urlgrabber-grabber.py (contents, props changed) Modified: head/www/py-urlgrabber/Makefile (contents, props changed) Modified: head/www/py-urlgrabber/Makefile ============================================================================== --- head/www/py-urlgrabber/Makefile Mon Jul 16 08:44:15 2012 (r300930) +++ head/www/py-urlgrabber/Makefile Mon Jul 16 08:51:22 2012 (r300931) @@ -7,7 +7,7 @@ PORTNAME= urlgrabber PORTVERSION= 3.9.1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= http://urlgrabber.baseurl.org/download/ \ http://nivi.interfree.it/distfiles/${PORTNAME}/ Added: head/www/py-urlgrabber/files/patch-urlgrabber-grabber.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/py-urlgrabber/files/patch-urlgrabber-grabber.py Mon Jul 16 08:51:22 2012 (r300931) @@ -0,0 +1,47 @@ +From: Seth Vidal +Date: Fri, 25 Sep 2009 20:16:08 +0000 (-0400) +Subject: - fileobject size = 0 not None +X-Git-Url: http://yum.baseurl.org/gitweb?p=urlgrabber.git;a=commitdiff_plain;h=f4e57ece7ded0f7ad83c8a40fe8423fab7812264;hp=926062a18852bc73686a5ef60307526841df8a32 + +- fileobject size = 0 not None +- if the filesize is small enough we could receive the whole thing in on chunk + and our max size message would never get out - so we make sure +- make sure we multiply correctly b/c python is anal +--- + +diff --git a/urlgrabber/grabber.py b/urlgrabber/grabber.py +index e090e90..c4916d5 100644 +--- urlgrabber/grabber.py ++++ urlgrabber/grabber.py +@@ -1052,7 +1052,7 @@ class PyCurlFileObject(): + self._reget_length = 0 + self._prog_running = False + self._error = (None, None) +- self.size = None ++ self.size = 0 + self._do_open() + + +@@ -1299,6 +1299,12 @@ class PyCurlFileObject(): + err.code = code + err.exception = e + raise err ++ else: ++ if self._error[1]: ++ msg = self._error[1] ++ err = URLGRabError(14, msg) ++ err.url = self.url ++ raise err + + def _do_open(self): + self.curl_obj = _curl_cache +@@ -1536,7 +1542,8 @@ class PyCurlFileObject(): + if self.opts.size: # if we set an opts size use that, no matter what + 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 > max_size + max_size*.10: ++ ++ if cur > int(float(max_size) * 1.10): + + msg = _("Downloaded more than max size for %s: %s > %s") \ + % (self.url, cur, max_size)