From 4d1cae3ee69af1d580735af809ecc4e5c7a59824 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chris=20=E2=80=9CKwpolska=E2=80=9D=20Warrick?= Date: Wed, 22 Jan 2014 16:25:21 +0100 Subject: [PATCH] v3.1.11: fix AUR/HTTP exceptions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Chris “Kwpolska” Warrick --- CHANGELOG.rst | 8 +++++++- CONTRIBUTING.rst | 2 +- PKGBUILD | 4 ++-- PKGBUILD-git | 2 +- README | 2 +- README.rst | 2 +- docs/CHANGELOG.rst | 8 +++++++- docs/CONTRIBUTING.rst | 2 +- docs/LICENSE.rst | 2 +- docs/README.rst | 2 +- docs/aur.rst | 2 +- docs/build.rst | 2 +- docs/conf.py | 2 +- docs/exceptions.rst | 2 +- docs/main.rst | 2 +- docs/package.rst | 2 +- docs/pb.rst | 2 +- docs/pbds.rst | 2 +- docs/pkgbuilder.rst | 2 +- docs/sample-scripts.rst | 2 +- docs/ui.rst | 2 +- docs/upgrade.rst | 2 +- docs/utils.rst | 2 +- docs/wrapper.rst | 2 +- locale/es/LC_MESSAGES/pkgbuilder.mo | Bin 13275 -> 13275 bytes locale/es/LC_MESSAGES/pkgbuilder.po | 4 ++-- locale/it/LC_MESSAGES/pkgbuilder.mo | Bin 13161 -> 13161 bytes locale/it/LC_MESSAGES/pkgbuilder.po | 4 ++-- locale/ja/LC_MESSAGES/pkgbuilder.mo | Bin 7781 -> 7781 bytes locale/ja/LC_MESSAGES/pkgbuilder.po | 4 ++-- locale/pl/LC_MESSAGES/pkgbuilder.mo | Bin 13789 -> 13789 bytes locale/pl/LC_MESSAGES/pkgbuilder.po | 4 ++-- locale/tr/LC_MESSAGES/pkgbuilder.mo | Bin 13082 -> 13082 bytes locale/tr/LC_MESSAGES/pkgbuilder.po | 4 ++-- locale/vi/LC_MESSAGES/pkgbuilder.mo | Bin 15353 -> 15353 bytes locale/vi/LC_MESSAGES/pkgbuilder.po | 4 ++-- messages.pot | 6 +++--- pkgbuilder/__init__.py | 2 +- pkgbuilder/aur.py | 2 +- setup.py | 2 +- 40 files changed, 55 insertions(+), 43 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e28ec2f..8190c8c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,7 +6,7 @@ Appendix C. Changelog :Copyright: © 2011-2014, Kwpolska. :License: BSD (see /LICENSE or :doc:`Appendix B `.) :Date: 2014-01-22 -:Version: 3.1.10 +:Version: 3.1.11 .. index:: CHANGELOG @@ -50,6 +50,12 @@ Version History Generation 3 ------------ +3.1.11 + * Fix AUR/HTTP exceptions reporting. (via Issue #28) + +3.1.11 + * Fix a small bug, leading to misreporting certain AUR/HTTP exceptions. + 3.1.10 * Inexistent packages don’t crash badly anymore * AUR-dependency-builds do not crash everything either diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index b745317..9a4df5a 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -5,7 +5,7 @@ Appendix A. Contribution rules :Copyright: © 2011-2014, Kwpolska. :License: BSD (see /LICENSE or :doc:`Appendix B `.) :Date: 2014-01-22 -:Version: 3.1.10 +:Version: 3.1.11 .. index:: contributing diff --git a/PKGBUILD b/PKGBUILD index 9dead64..c37318f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Kwpolska pkgname=pkgbuilder _pyname=pkgbuilder -pkgver=3.1.10 +pkgver=3.1.11 pkgrel=1 pkgdesc='A Python AUR helper/library.' arch=('any') @@ -10,7 +10,7 @@ license=('BSD') depends=('python' 'pyalpm>=0.5.1-1' 'python-requests' 'rsync') options=(!emptydirs) source=("http://pypi.python.org/packages/source/$(echo ${_pyname} | cut -c1)/${_pyname}/${_pyname}-${pkgver}.tar.gz") -md5sums=('a8c42315abb23ca8dea399832385c976') +md5sums=('59f36101dccced42e371b9a9f99d472d') package() { cd "${srcdir}/${_pyname}-${pkgver}" diff --git a/PKGBUILD-git b/PKGBUILD-git index 3488f36..009f11b 100644 --- a/PKGBUILD-git +++ b/PKGBUILD-git @@ -2,7 +2,7 @@ pkgname=pkgbuilder-git _pyname=pkgbuilder _gitname=pkgbuilder -pkgver=3.1.10 +pkgver=3.1.11 pkgrel=1 pkgdesc='A Python AUR helper/library. (git version)' arch=('any') diff --git a/README b/README index dbc9a3e..96bcbb5 100644 --- a/README +++ b/README @@ -4,7 +4,7 @@ PKGBUILDer. An AUR helper (and library) in Python 3. :Info: This is the README file for PKGBUILDer. :Author: Chris “Kwpolska” Warrick :Date: 2014-01-22 -:Version: 3.1.10 +:Version: 3.1.11 .. index: README diff --git a/README.rst b/README.rst index dbc9a3e..96bcbb5 100644 --- a/README.rst +++ b/README.rst @@ -4,7 +4,7 @@ PKGBUILDer. An AUR helper (and library) in Python 3. :Info: This is the README file for PKGBUILDer. :Author: Chris “Kwpolska” Warrick :Date: 2014-01-22 -:Version: 3.1.10 +:Version: 3.1.11 .. index: README diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index e28ec2f..8190c8c 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -6,7 +6,7 @@ Appendix C. Changelog :Copyright: © 2011-2014, Kwpolska. :License: BSD (see /LICENSE or :doc:`Appendix B `.) :Date: 2014-01-22 -:Version: 3.1.10 +:Version: 3.1.11 .. index:: CHANGELOG @@ -50,6 +50,12 @@ Version History Generation 3 ------------ +3.1.11 + * Fix AUR/HTTP exceptions reporting. (via Issue #28) + +3.1.11 + * Fix a small bug, leading to misreporting certain AUR/HTTP exceptions. + 3.1.10 * Inexistent packages don’t crash badly anymore * AUR-dependency-builds do not crash everything either diff --git a/docs/CONTRIBUTING.rst b/docs/CONTRIBUTING.rst index b745317..9a4df5a 100644 --- a/docs/CONTRIBUTING.rst +++ b/docs/CONTRIBUTING.rst @@ -5,7 +5,7 @@ Appendix A. Contribution rules :Copyright: © 2011-2014, Kwpolska. :License: BSD (see /LICENSE or :doc:`Appendix B `.) :Date: 2014-01-22 -:Version: 3.1.10 +:Version: 3.1.11 .. index:: contributing diff --git a/docs/LICENSE.rst b/docs/LICENSE.rst index 7b17680..1d417a0 100644 --- a/docs/LICENSE.rst +++ b/docs/LICENSE.rst @@ -4,7 +4,7 @@ Appendix B. License for PKGBUILDer :Info: This is the license for PKGBUILDer. :Author: Chris “Kwpolska” Warrick :Date: 2014-01-22 -:Version: 3.1.10 +:Version: 3.1.11 .. index:: LICENSE diff --git a/docs/README.rst b/docs/README.rst index dbc9a3e..96bcbb5 100644 --- a/docs/README.rst +++ b/docs/README.rst @@ -4,7 +4,7 @@ PKGBUILDer. An AUR helper (and library) in Python 3. :Info: This is the README file for PKGBUILDer. :Author: Chris “Kwpolska” Warrick :Date: 2014-01-22 -:Version: 3.1.10 +:Version: 3.1.11 .. index: README diff --git a/docs/aur.rst b/docs/aur.rst index 9c79626..23eb5d5 100644 --- a/docs/aur.rst +++ b/docs/aur.rst @@ -5,7 +5,7 @@ aur module (AUR class) :Copyright: © 2011-2014, Kwpolska. :License: BSD (see /LICENSE or :doc:`Appendix B `.) :Date: 2014-01-22 -:Version: 3.1.10 +:Version: 3.1.11 .. index:: AUR; RPC .. index:: RPC diff --git a/docs/build.rst b/docs/build.rst index 7fd7ea1..941260c 100644 --- a/docs/build.rst +++ b/docs/build.rst @@ -6,7 +6,7 @@ build module :Copyright: © 2011-2014, Kwpolska. :License: BSD (see /LICENSE or :doc:`Appendix B `.) :Date: 2014-01-22 -:Version: 3.1.10 +:Version: 3.1.11 .. index:: build .. versionadded:: 2.1.0.0 diff --git a/docs/conf.py b/docs/conf.py index 03142c5..91c104b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -50,7 +50,7 @@ # The short X.Y version. version = '3.0' # The full version, including alpha/beta/rc tags. -release = '3.1.10' +release = '3.1.11' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/exceptions.rst b/docs/exceptions.rst index 83a2941..4947fa7 100644 --- a/docs/exceptions.rst +++ b/docs/exceptions.rst @@ -6,7 +6,7 @@ Exceptions in PKGBUILDer :Copyright: © 2011-2014, Kwpolska. :License: BSD (see /LICENSE or :doc:`Appendix B `.) :Date: 2014-01-22 -:Version: 3.1.10 +:Version: 3.1.11 .. index:: Exceptions .. versionadded:: 3.0.0 diff --git a/docs/main.rst b/docs/main.rst index db9d63d..d36a67c 100644 --- a/docs/main.rst +++ b/docs/main.rst @@ -5,7 +5,7 @@ main module :Copyright: © 2011-2014, Kwpolska. :License: BSD (see /LICENSE or :doc:`Appendix B `.) :Date: 2014-01-22 -:Version: 3.1.10 +:Version: 3.1.11 .. index:: main .. versionadded:: 2.1.3.0 diff --git a/docs/package.rst b/docs/package.rst index 0839c2d..3f0e6cd 100644 --- a/docs/package.rst +++ b/docs/package.rst @@ -6,7 +6,7 @@ package module (Package, AURPackage, ABSPackage classes) :Copyright: © 2011-2014, Kwpolska. :License: BSD (see /LICENSE or :doc:`Appendix B `.) :Date: 2014-01-22 -:Version: 3.1.10 +:Version: 3.1.11 .. index:: Package .. index:: AURPackage diff --git a/docs/pb.rst b/docs/pb.rst index d99b24c..8ffbdfc 100644 --- a/docs/pb.rst +++ b/docs/pb.rst @@ -7,7 +7,7 @@ PBWrapper :Copyright: © 2011-2014, Kwpolska. :License: BSD (see /LICENSE or Appendix B.) :Date: 2014-01-22 -:Version: 3.1.10 +:Version: 3.1.11 :Wrapper Version: 0.2.3 :Manual section: 8 :Manual group: PKGBUILDer manual diff --git a/docs/pbds.rst b/docs/pbds.rst index a767ef1..672d68d 100644 --- a/docs/pbds.rst +++ b/docs/pbds.rst @@ -6,7 +6,7 @@ pbds module (PBDS class) :Copyright: © 2011-2014, Kwpolska. :License: BSD (see /LICENSE or :doc:`Appendix B `.) :Date: 2014-01-22 -:Version: 3.1.10 +:Version: 3.1.11 .. module: pbds diff --git a/docs/pkgbuilder.rst b/docs/pkgbuilder.rst index 93dd3cb..5d4c053 100644 --- a/docs/pkgbuilder.rst +++ b/docs/pkgbuilder.rst @@ -7,7 +7,7 @@ PKGBUILDer :Copyright: © 2011-2014, Kwpolska. :License: BSD (see /LICENSE or Appendix B.) :Date: 2014-01-22 -:Version: 3.1.10 +:Version: 3.1.11 :Manual section: 8 :Manual group: PKGBUILDer manual diff --git a/docs/sample-scripts.rst b/docs/sample-scripts.rst index 40de693..2809de6 100644 --- a/docs/sample-scripts.rst +++ b/docs/sample-scripts.rst @@ -5,7 +5,7 @@ PKGBUILDer Sample Scripts :Copyright: © 2011-2014, Kwpolska. :License: BSD (see /LICENSE or :doc:`Appendix B `.) :Date: 2014-01-22 -:Version: 3.1.10 +:Version: 3.1.11 .. index:: sample scripts diff --git a/docs/ui.rst b/docs/ui.rst index 17999e0..0f5d7b7 100644 --- a/docs/ui.rst +++ b/docs/ui.rst @@ -6,7 +6,7 @@ ui module (UI class) :Copyright: © 2011-2014, Kwpolska. :License: BSD (see /LICENSE or :doc:`Appendix B `.) :Date: 2014-01-22 -:Version: 3.1.10 +:Version: 3.1.11 .. index:: UI .. versionadded:: 3.0.0 diff --git a/docs/upgrade.rst b/docs/upgrade.rst index c8f8818..033e481 100644 --- a/docs/upgrade.rst +++ b/docs/upgrade.rst @@ -6,7 +6,7 @@ upgrade module :Copyright: © 2011-2014, Kwpolska. :License: BSD (see /LICENSE or :doc:`Appendix B `.) :Date: 2014-01-22 -:Version: 3.1.10 +:Version: 3.1.11 .. index:: upgrade .. index:: Syu diff --git a/docs/utils.rst b/docs/utils.rst index 9bfb1e5..542555b 100644 --- a/docs/utils.rst +++ b/docs/utils.rst @@ -6,7 +6,7 @@ utils module :Copyright: © 2011-2014, Kwpolska. :License: BSD (see /LICENSE or :doc:`Appendix B `.) :Date: 2014-01-22 -:Version: 3.1.10 +:Version: 3.1.11 .. index:: utils .. versionadded:: 2.1.0.0 diff --git a/docs/wrapper.rst b/docs/wrapper.rst index cd42468..33acb4c 100644 --- a/docs/wrapper.rst +++ b/docs/wrapper.rst @@ -5,7 +5,7 @@ PBWrapper :Copyright: © 2011-2014, Kwpolska. :License: BSD (see /LICENSE or :doc:`Appendix B `.) :Date: 2014-01-22 -:Version: 3.1.10 +:Version: 3.1.11 :PBWrapper Version: 0.2.3 .. index:: wrapper diff --git a/locale/es/LC_MESSAGES/pkgbuilder.mo b/locale/es/LC_MESSAGES/pkgbuilder.mo index 72b87c27282bff327e42621fcd6b7ae133b78d0f..748ca4effcd4428e85982e96f397480099483d0e 100644 GIT binary patch delta 23 fcmcbeemi}`92rK#$#Z4GSj?=9OgDd*c_Ib?cz_99 delta 23 fcmcbeemi}`92rJ~$#Z4GSWK-Unc_Ib?cyS3^ diff --git a/locale/es/LC_MESSAGES/pkgbuilder.po b/locale/es/LC_MESSAGES/pkgbuilder.po index 647e43b..a492940 100644 --- a/locale/es/LC_MESSAGES/pkgbuilder.po +++ b/locale/es/LC_MESSAGES/pkgbuilder.po @@ -9,9 +9,9 @@ # tufadorin , 2013 msgid "" msgstr "" -"Project-Id-Version: 3.1.10\n" +"Project-Id-Version: 3.1.11\n" "Report-Msgid-Bugs-To: Kwpolska \n" -"POT-Creation-Date: 2014-01-22 15:53+0100\n" +"POT-Creation-Date: 2014-01-22 16:25+0100\n" "PO-Revision-Date: 2013-08-23 15:58+0000\n" "Last-Translator: Kwpolska \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/pkgbuilder/" diff --git a/locale/it/LC_MESSAGES/pkgbuilder.mo b/locale/it/LC_MESSAGES/pkgbuilder.mo index 696b551e825c799d1fa5c7b100fd15155fb38f15..a9827d5639464f81fdc30f084540fa4e3cd72bea 100644 GIT binary patch delta 23 fcmaEv_A+h592rK#$#Z4GSj?=9OgDd*DG~z!dD;mC delta 23 fcmaEv_A+h592rJ~$#Z4GSWK-UnDG~z!dCLg{ diff --git a/locale/it/LC_MESSAGES/pkgbuilder.po b/locale/it/LC_MESSAGES/pkgbuilder.po index 044eb10..9c0ba80 100644 --- a/locale/it/LC_MESSAGES/pkgbuilder.po +++ b/locale/it/LC_MESSAGES/pkgbuilder.po @@ -8,9 +8,9 @@ # Kwpolska , 2013 msgid "" msgstr "" -"Project-Id-Version: 3.1.10\n" +"Project-Id-Version: 3.1.11\n" "Report-Msgid-Bugs-To: Kwpolska \n" -"POT-Creation-Date: 2014-01-22 15:53+0100\n" +"POT-Creation-Date: 2014-01-22 16:25+0100\n" "PO-Revision-Date: 2013-08-23 15:58+0000\n" "Last-Translator: Kwpolska \n" "Language-Team: Italian (http://www.transifex.com/projects/p/pkgbuilder/" diff --git a/locale/ja/LC_MESSAGES/pkgbuilder.mo b/locale/ja/LC_MESSAGES/pkgbuilder.mo index b150709c5883376b6e9decd173834f1fb85759d1..76233de400a210b308b73069d3b1a90613f2aba1 100644 GIT binary patch delta 23 fcmaEA^VDX;d45L2$rt#;Sj?=9OgC!@Sn~k@b1Vnk delta 23 fcmaEA^VDX;d45KN$rt#;SWK-\n" -"POT-Creation-Date: 2014-01-22 15:53+0100\n" +"POT-Creation-Date: 2014-01-22 16:25+0100\n" "PO-Revision-Date: 2013-08-23 15:58+0000\n" "Last-Translator: Kwpolska \n" "Language-Team: Japanese (http://www.transifex.com/projects/p/pkgbuilder/" diff --git a/locale/pl/LC_MESSAGES/pkgbuilder.mo b/locale/pl/LC_MESSAGES/pkgbuilder.mo index d0a47cbc59d52c4e5aa46ea6ff30f8a4b2fb1ac5..cb84624efca9806ae35c183150e1b6e6374cdd21 100644 GIT binary patch delta 23 fcmcbceK&i, 2013 msgid "" msgstr "" -"Project-Id-Version: 3.1.10\n" +"Project-Id-Version: 3.1.11\n" "Report-Msgid-Bugs-To: Kwpolska \n" -"POT-Creation-Date: 2014-01-22 15:53+0100\n" +"POT-Creation-Date: 2014-01-22 16:25+0100\n" "PO-Revision-Date: 2013-08-23 15:59+0000\n" "Last-Translator: Kwpolska \n" "Language-Team: Polish (http://www.transifex.com/projects/p/pkgbuilder/" diff --git a/locale/tr/LC_MESSAGES/pkgbuilder.mo b/locale/tr/LC_MESSAGES/pkgbuilder.mo index 50143a620f60678df9dbcd86cfddc8f689cf0b2f..5a851c1e67e1b5fc9f0f23e29d2a8a513d388c1b 100644 GIT binary patch delta 23 fcmbQ0HY;tz92rK#$#Z4GSj?=9OgDd*Q5FLLYp4hp delta 23 fcmbQ0HY;tz92rJ~$#Z4GSWK-UnQ5FLLYnccZ diff --git a/locale/tr/LC_MESSAGES/pkgbuilder.po b/locale/tr/LC_MESSAGES/pkgbuilder.po index e9715ca..68dec93 100644 --- a/locale/tr/LC_MESSAGES/pkgbuilder.po +++ b/locale/tr/LC_MESSAGES/pkgbuilder.po @@ -8,9 +8,9 @@ # yfdogan , 2013 msgid "" msgstr "" -"Project-Id-Version: 3.1.10\n" +"Project-Id-Version: 3.1.11\n" "Report-Msgid-Bugs-To: Kwpolska \n" -"POT-Creation-Date: 2014-01-22 15:53+0100\n" +"POT-Creation-Date: 2014-01-22 16:25+0100\n" "PO-Revision-Date: 2013-08-23 15:58+0000\n" "Last-Translator: Kwpolska \n" "Language-Team: Turkish (http://www.transifex.com/projects/p/pkgbuilder/" diff --git a/locale/vi/LC_MESSAGES/pkgbuilder.mo b/locale/vi/LC_MESSAGES/pkgbuilder.mo index 49a6ed6a337218df114a88ce76866bd02a8f15c6..5f744c900999f29460cdd07d1b52035af8920c0b 100644 GIT binary patch delta 23 ecmexa{!z, 2013 msgid "" msgstr "" -"Project-Id-Version: 3.1.10\n" +"Project-Id-Version: 3.1.11\n" "Report-Msgid-Bugs-To: Kwpolska \n" -"POT-Creation-Date: 2014-01-22 15:53+0100\n" +"POT-Creation-Date: 2014-01-22 16:25+0100\n" "PO-Revision-Date: 2013-08-23 15:58+0000\n" "Last-Translator: Kwpolska \n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/pkgbuilder/" diff --git a/messages.pot b/messages.pot index 1587622..0989c76 100644 --- a/messages.pot +++ b/messages.pot @@ -5,10 +5,10 @@ # msgid "" msgstr "" - "Project-Id-Version: 3.1.10\n" + "Project-Id-Version: 3.1.11\n" "Report-Msgid-Bugs-To: Kwpolska \n" - "POT-Creation-Date: 2014-01-22 15:53+0100\n" - "PO-Revision-Date: 2014-01-22 15:53+0100\n" + "POT-Creation-Date: 2014-01-22 16:25+0100\n" + "PO-Revision-Date: 2014-01-22 16:25+0100\n" "Last-Translator: Kwpolska \n" "Language-Team: Kwpolska \n" "Language: en\n" diff --git a/pkgbuilder/__init__.py b/pkgbuilder/__init__.py index 608ab2c..a6e6911 100644 --- a/pkgbuilder/__init__.py +++ b/pkgbuilder/__init__.py @@ -44,7 +44,7 @@ """ __title__ = 'PKGBUILDer' -__version__ = '3.1.10' +__version__ = '3.1.11' __author__ = 'Kwpolska' __license__ = '3-clause BSD' __docformat__ = 'restructuredtext en' diff --git a/pkgbuilder/aur.py b/pkgbuilder/aur.py index 3f5bed9..c99face 100644 --- a/pkgbuilder/aur.py +++ b/pkgbuilder/aur.py @@ -81,7 +81,7 @@ def jsonmultiinfo(self, args): except requests.exceptions.ConnectionError as e: raise ConnectionError(e.args[0].reason, e) except requests.exceptions.HTTPError as e: - raise HTTPError(req, origexception=e) + raise HTTPError(req, e) except requests.exceptions.RequestException as e: raise NetworkError(str(e), e) diff --git a/setup.py b/setup.py index 49cc059..bd04ff7 100755 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ from distutils.core import setup setup(name='pkgbuilder', - version='3.1.10', + version='3.1.11', description='An AUR helper (and library) in Python 3.', keywords='arch pkgbuild', author='Chris “Kwpolska” Warrick',