diff options
author | Michał Górny <mgorny@gentoo.org> | 2020-03-29 12:26:13 +0200 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2020-03-29 12:29:39 +0200 |
commit | 7eea5f1395ae28326cbcc92c20adf507e0fc62a8 (patch) | |
tree | 7aec758cbceb728d2f7eb8ed52b3e55f5323d60f /dev-python/urlgrabber | |
parent | dev-python/uritemplate: Remove redundant versions (diff) | |
download | gentoo-7eea5f1395ae28326cbcc92c20adf507e0fc62a8.tar.gz gentoo-7eea5f1395ae28326cbcc92c20adf507e0fc62a8.tar.bz2 gentoo-7eea5f1395ae28326cbcc92c20adf507e0fc62a8.zip |
dev-python/urlgrabber: Remove redundant versions
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'dev-python/urlgrabber')
-rw-r--r-- | dev-python/urlgrabber/Manifest | 1 | ||||
-rw-r--r-- | dev-python/urlgrabber/files/urlgrabber-3.9.1.patch | 26 | ||||
-rw-r--r-- | dev-python/urlgrabber/urlgrabber-3.10.1.ebuild | 21 | ||||
-rw-r--r-- | dev-python/urlgrabber/urlgrabber-3.9.1-r2.ebuild | 27 |
4 files changed, 0 insertions, 75 deletions
diff --git a/dev-python/urlgrabber/Manifest b/dev-python/urlgrabber/Manifest index 2826cc74d981..11c8d8797e8d 100644 --- a/dev-python/urlgrabber/Manifest +++ b/dev-python/urlgrabber/Manifest @@ -1,2 +1 @@ DIST urlgrabber-3.10.1.tar.gz 83735 BLAKE2B ea0b3c071f968b2632e89cf225906740685b0f1134d41cf8aaf7e6361110780f6c998b06e4d79527be7e7953c5c4a617d039477135135cc7fc13a0426f0d9ee0 SHA512 c44d32b17c5f8984d09ed46ae36b3e05dc69d041820cf979029bc325d8407bbd7e324f264be5886286cd99e123f51affec26638cab6e525f85e2a1c4247462d7 -DIST urlgrabber-3.9.1.tar.gz 72343 BLAKE2B 2c3d9e9a994e0a918bc364aae37664ad41ccb60a09c72c3862e7e79d44e50efedca362e321607ed2971822adc694a8a61b8a861625e830bbb897859e1c6888c9 SHA512 897f0bd09485c207d735a814fda7cf053c71262e31e87f358c473da770abaf7fd339ae6802df978091889c5d6fe123f74d5386d79c47f93b36cefbc22f44db47 diff --git a/dev-python/urlgrabber/files/urlgrabber-3.9.1.patch b/dev-python/urlgrabber/files/urlgrabber-3.9.1.patch deleted file mode 100644 index bdcc9cb1d465..000000000000 --- a/dev-python/urlgrabber/files/urlgrabber-3.9.1.patch +++ /dev/null @@ -1,26 +0,0 @@ -http://yum.baseurl.org/gitweb?p=urlgrabber.git;a=commitdiff;h=f4e57ece7ded0f7ad83c8a40fe8423fab7812264 -http://yum.baseurl.org/gitweb?p=urlgrabber.git;a=commitdiff;h=89cc380a2a251a1d2d8b91cf6df170fa546597aa - -diff --git a/urlgrabber/grabber.py b/urlgrabber/grabber.py -index f98f423..7b7f979 100644 ---- a/urlgrabber/grabber.py -+++ b/urlgrabber/grabber.py -@@ -1532,11 +1589,14 @@ - 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 > 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) diff --git a/dev-python/urlgrabber/urlgrabber-3.10.1.ebuild b/dev-python/urlgrabber/urlgrabber-3.10.1.ebuild deleted file mode 100644 index 1fc385c1217c..000000000000 --- a/dev-python/urlgrabber/urlgrabber-3.10.1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -DESCRIPTION="Python module for downloading files" -HOMEPAGE="http://urlgrabber.baseurl.org" -SRC_URI="http://urlgrabber.baseurl.org/download/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86" -IUSE="" - -DEPEND="dev-python/pycurl[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" -# Entire testsuite relies on connecting to the i'net diff --git a/dev-python/urlgrabber/urlgrabber-3.9.1-r2.ebuild b/dev-python/urlgrabber/urlgrabber-3.9.1-r2.ebuild deleted file mode 100644 index 7c48e94bb3e4..000000000000 --- a/dev-python/urlgrabber/urlgrabber-3.9.1-r2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -DESCRIPTION="Python module for downloading files" -HOMEPAGE="http://urlgrabber.baseurl.org" -SRC_URI="http://urlgrabber.baseurl.org/download/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~ia64 ppc ppc64 x86" -IUSE="" - -DEPEND="dev-python/pycurl[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" - -python_prepare_all() { - local PATCHES=( - "${FILESDIR}"/${P}.patch - ) - distutils-r1_python_prepare_all -} |