v4.2.15: avoid crashes if package name contains + signs

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
Kwpolska · Mar 17, 2018 · 00005cf · 00005cf
1 parent 508369e
commit 00005cf
Show file tree

Hide file tree

Showing 67 changed files with 353 additions and 346 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -5,8 +5,8 @@ Appendix C. Changelog
 :Author: Chris Warrick <chris@chriswarrick.com>
 :Copyright: © 2011-2018, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2017-07-13
-:Version: 4.2.14
+:Date: 2018-03-18
+:Version: 4.2.15
 
 .. index:: CHANGELOG
 
@@ -47,6 +47,9 @@ More information can be found on GitHub in the `releases section <https://github
 Version History
 ===============
 
+4.2.15
+    * Avoid crashes if package name contains `+` signs (or other characters not allowed in regular expressions).
+
 4.2.14
     * Fix multiinfo glitch if there are no packages
 

diff --git a/PKGBUILD b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Chris Warrick <aur@chriswarrick.com>
 pkgname=pkgbuilder
 _pyname=pkgbuilder
-pkgver=4.2.14
+pkgver=4.2.15
 pkgrel=1
 pkgdesc='A Python AUR helper/library.'
 arch=('any')
@@ -10,7 +10,7 @@ license=('BSD')
 depends=('python' 'python-setuptools' 'pyalpm>=0.5.1-1' 'python-requests' 'python-srcinfo' 'asp' 'git')
 options=(!emptydirs)
 source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
-md5sums=('3b0efaaad04d9e45c8d9001414d5aaf3')
+md5sums=('17ce7100fb3a356564648e315e8f3246')
 
 package() {
   cd "${srcdir}/${_pyname}-${pkgver}"

diff --git a/PKGBUILD-git b/PKGBUILD-git
@@ -2,7 +2,7 @@
 pkgname=pkgbuilder-git
 _pyname=pkgbuilder
 _gitname=pkgbuilder
-pkgver=4.2.14
+pkgver=4.2.15
 pkgrel=1
 pkgdesc='A Python AUR helper/library. (git version)'
 arch=('any')

diff --git a/README b/README
@@ -3,8 +3,8 @@ PKGBUILDer.  An AUR helper (and library) in Python 3.
 =====================================================
 :Info: This is the README file for PKGBUILDer.
 :Author: Chris Warrick <chris@chriswarrick.com>
-:Date: 2017-07-13
-:Version: 4.2.14
+:Date: 2018-03-18
+:Version: 4.2.15
 
 .. index: README
 

diff --git a/README.rst b/README.rst
@@ -3,8 +3,8 @@ PKGBUILDer.  An AUR helper (and library) in Python 3.
 =====================================================
 :Info: This is the README file for PKGBUILDer.
 :Author: Chris Warrick <chris@chriswarrick.com>
-:Date: 2017-07-13
-:Version: 4.2.14
+:Date: 2018-03-18
+:Version: 4.2.15
 
 .. index: README
 

diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
@@ -5,8 +5,8 @@ Appendix C. Changelog
 :Author: Chris Warrick <chris@chriswarrick.com>
 :Copyright: © 2011-2018, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2017-07-13
-:Version: 4.2.14
+:Date: 2018-03-18
+:Version: 4.2.15
 
 .. index:: CHANGELOG
 
@@ -47,6 +47,9 @@ More information can be found on GitHub in the `releases section <https://github
 Version History
 ===============
 
+4.2.15
+    * Avoid crashes if package name contains `+` signs (or other characters not allowed in regular expressions).
+
 4.2.14
     * Fix multiinfo glitch if there are no packages
 

diff --git a/docs/LICENSE.rst b/docs/LICENSE.rst
@@ -3,8 +3,8 @@ Appendix B. License for PKGBUILDer
 ==================================
 :Info: This is the license for PKGBUILDer.
 :Author: Chris Warrick <chris@chriswarrick.com>
-:Date: 2017-07-13
-:Version: 4.2.14
+:Date: 2018-03-18
+:Version: 4.2.15
 
 .. index:: LICENSE
 

diff --git a/docs/README.rst b/docs/README.rst
@@ -3,8 +3,8 @@ PKGBUILDer.  An AUR helper (and library) in Python 3.
 =====================================================
 :Info: This is the README file for PKGBUILDer.
 :Author: Chris Warrick <chris@chriswarrick.com>
-:Date: 2017-07-13
-:Version: 4.2.14
+:Date: 2018-03-18
+:Version: 4.2.15
 
 .. index: README
 

diff --git a/docs/aur.rst b/docs/aur.rst
@@ -4,8 +4,8 @@ aur module (AUR class)
 :Author: Chris Warrick <chris@chriswarrick.com>
 :Copyright: © 2011-2018, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2017-07-13
-:Version: 4.2.14
+:Date: 2018-03-18
+:Version: 4.2.15
 
 .. index:: AUR; RPC
 .. index:: RPC

diff --git a/docs/build.rst b/docs/build.rst
@@ -5,8 +5,8 @@ build module
 :Author: Chris Warrick <chris@chriswarrick.com>
 :Copyright: © 2011-2018, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2017-07-13
-:Version: 4.2.14
+:Date: 2018-03-18
+:Version: 4.2.15
 
 .. index:: build
 .. versionadded:: 2.1.0.0

diff --git a/docs/conf.py b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.2.14'
+version = '4.2.15'
 # The full version, including alpha/beta/rc tags.
-release = '4.2.14'
+release = '4.2.15'
 
 # 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
@@ -5,8 +5,8 @@ Exceptions in PKGBUILDer
 :Author: Chris Warrick <chris@chriswarrick.com>
 :Copyright: © 2011-2018, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2017-07-13
-:Version: 4.2.14
+:Date: 2018-03-18
+:Version: 4.2.15
 
 .. index:: Exceptions
 .. versionadded:: 3.0.0

diff --git a/docs/main.rst b/docs/main.rst
@@ -4,8 +4,8 @@ __main__ module
 :Author: Chris Warrick <chris@chriswarrick.com>
 :Copyright: © 2011-2018, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2017-07-13
-:Version: 4.2.14
+:Date: 2018-03-18
+:Version: 4.2.15
 
 .. index:: main
 .. versionchanged:: 4.0.0

diff --git a/docs/package.rst b/docs/package.rst
@@ -5,8 +5,8 @@ package module (Package, AURPackage, ABSPackage classes)
 :Author: Chris Warrick <chris@chriswarrick.com>
 :Copyright: © 2011-2018, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2017-07-13
-:Version: 4.2.14
+:Date: 2018-03-18
+:Version: 4.2.15
 
 .. index:: Package
 .. index:: AURPackage

diff --git a/docs/pb.8.gz b/docs/pb.8.gz
diff --git a/docs/pb.rst b/docs/pb.rst
@@ -6,8 +6,8 @@ PBWrapper
 :Author: Chris Warrick <chris@chriswarrick.com>
 :Copyright: © 2011-2018, Chris Warrick.
 :License: BSD (see /LICENSE or Appendix B.)
-:Date: 2017-07-13
-:Version: 4.2.14
+:Date: 2018-03-18
+:Version: 4.2.15
 :Wrapper Version: 0.5.3
 :Manual section: 8
 :Manual group: PKGBUILDer manual

diff --git a/docs/pbds.rst b/docs/pbds.rst
@@ -5,8 +5,8 @@ pbds module (PBDS class)
 :Author: Chris Warrick <chris@chriswarrick.com>
 :Copyright: © 2011-2018, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2017-07-13
-:Version: 4.2.14
+:Date: 2018-03-18
+:Version: 4.2.15
 
 .. module: pbds
 

diff --git a/docs/pkgbuilder.8.gz b/docs/pkgbuilder.8.gz
diff --git a/docs/pkgbuilder.rst b/docs/pkgbuilder.rst
@@ -6,8 +6,8 @@ PKGBUILDer
 :Author: Chris Warrick <chris@chriswarrick.com>
 :Copyright: © 2011-2018, Chris Warrick.
 :License: BSD (see /LICENSE or Appendix B.)
-:Date: 2017-07-13
-:Version: 4.2.14
+:Date: 2018-03-18
+:Version: 4.2.15
 :Manual section: 8
 :Manual group: PKGBUILDer manual
 

diff --git a/docs/sample-scripts.rst b/docs/sample-scripts.rst
@@ -4,8 +4,8 @@ PKGBUILDer Sample Scripts
 :Author: Chris Warrick <chris@chriswarrick.com>
 :Copyright: © 2011-2018, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2017-07-13
-:Version: 4.2.14
+:Date: 2018-03-18
+:Version: 4.2.15
 
 .. index:: sample scripts
 

diff --git a/docs/transaction.rst b/docs/transaction.rst
@@ -5,8 +5,8 @@ Transactions
 :Author: Chris Warrick <chris@chriswarrick.com>
 :Copyright: © 2011-2018, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2017-07-13
-:Version: 4.2.14
+:Date: 2018-03-18
+:Version: 4.2.15
 
 .. index:: transaction
 .. versionadded:: 4.1.0

diff --git a/docs/ui.rst b/docs/ui.rst
@@ -5,8 +5,8 @@ ui module (UI class)
 :Author: Chris Warrick <chris@chriswarrick.com>
 :Copyright: © 2011-2018, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2017-07-13
-:Version: 4.2.14
+:Date: 2018-03-18
+:Version: 4.2.15
 
 .. index:: UI
 .. versionadded:: 3.0.0

diff --git a/docs/upgrade.rst b/docs/upgrade.rst
@@ -5,8 +5,8 @@ upgrade module
 :Author: Chris Warrick <chris@chriswarrick.com>
 :Copyright: © 2011-2018, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2017-07-13
-:Version: 4.2.14
+:Date: 2018-03-18
+:Version: 4.2.15
 
 .. index:: upgrade
 .. index:: Syu

diff --git a/docs/utils.rst b/docs/utils.rst
@@ -5,8 +5,8 @@ utils module
 :Author: Chris Warrick <chris@chriswarrick.com>
 :Copyright: © 2011-2018, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2017-07-13
-:Version: 4.2.14
+:Date: 2018-03-18
+:Version: 4.2.15
 
 .. index:: utils
 .. versionadded:: 2.1.0.0

diff --git a/docs/wrapper.rst b/docs/wrapper.rst
@@ -4,8 +4,8 @@ PBWrapper
 :Author: Chris Warrick <chris@chriswarrick.com>
 :Copyright: © 2011-2018, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2017-07-13
-:Version: 4.2.14
+:Date: 2018-03-18
+:Version: 4.2.15
 :PBWrapper Version: 0.2.3
 
 .. index:: wrapper

diff --git a/locale/ar/LC_MESSAGES/pkgbuilder.mo b/locale/ar/LC_MESSAGES/pkgbuilder.mo
diff --git a/locale/ar/LC_MESSAGES/pkgbuilder.po b/locale/ar/LC_MESSAGES/pkgbuilder.po
@@ -5,9 +5,9 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 4.2.14\n"
+"Project-Id-Version: 4.2.15\n"
 "Report-Msgid-Bugs-To: Chris Warrick <chris@chriswarrick.com>\n"
-"POT-Creation-Date: 2017-07-13 12:24+0200\n"
+"POT-Creation-Date: 2018-03-18 00:07+0100\n"
 "PO-Revision-Date: 2015-09-08 15:37+0000\n"
 "Last-Translator: Chris Warrick <kwpolska@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.com/kwpolska/pkgbuilder/language/"
@@ -44,77 +44,77 @@ msgstr ""
 msgid "makepkg (or someone else) failed and returned {0}."
 msgstr ""
 
-#: pkgbuilder/build.py:300
+#: pkgbuilder/build.py:301
 #, python-brace-format
 msgid "Failed to fulfill package dependency requirement: {0}"
 msgstr ""
 
-#: pkgbuilder/build.py:359 pkgbuilder/__main__.py:325
+#: pkgbuilder/build.py:360 pkgbuilder/__main__.py:325
 msgid "Fetching package information..."
 msgstr ""
 
-#: pkgbuilder/build.py:390
+#: pkgbuilder/build.py:391
 msgid ":: Retrieving packages from asp..."
 msgstr ""
 
-#: pkgbuilder/build.py:393
+#: pkgbuilder/build.py:394
 #, python-brace-format
 msgid "retrieving {0}"
 msgstr ""
 
-#: pkgbuilder/build.py:397 pkgbuilder/build.py:449
+#: pkgbuilder/build.py:398 pkgbuilder/build.py:450
 #, python-brace-format
 msgid "Failed to retieve {0} (from ASP)."
 msgstr ""
 
-#: pkgbuilder/build.py:401
+#: pkgbuilder/build.py:402
 msgid ":: Retrieving packages from aur..."
 msgstr ""
 
-#: pkgbuilder/build.py:404
+#: pkgbuilder/build.py:405
 #, python-brace-format
 msgid "cloning {0}"
 msgstr ""
 
-#: pkgbuilder/build.py:407
+#: pkgbuilder/build.py:408
 msgid "Successfully fetched: "
 msgstr ""
 
-#: pkgbuilder/build.py:437
+#: pkgbuilder/build.py:438
 #, python-brace-format
 msgid "Building {0}..."
 msgstr ""
 
-#: pkgbuilder/build.py:445
+#: pkgbuilder/build.py:446
 msgid "Retrieving from ASP..."
 msgstr ""
 
-#: pkgbuilder/build.py:454 pkgbuilder/build.py:478
+#: pkgbuilder/build.py:455 pkgbuilder/build.py:479
 #, python-brace-format
 msgid "Found an existing package for {0}"
 msgstr ""
 
-#: pkgbuilder/build.py:483
+#: pkgbuilder/build.py:484
 msgid "Cloning the git repository..."
 msgstr ""
 
-#: pkgbuilder/build.py:491
+#: pkgbuilder/build.py:492
 msgid "Checking dependencies..."
 msgstr ""
 
-#: pkgbuilder/build.py:494
+#: pkgbuilder/build.py:495
 msgid "found in system"
 msgstr ""
 
-#: pkgbuilder/build.py:494
+#: pkgbuilder/build.py:495
 msgid "found in repos"
 msgstr ""
 
-#: pkgbuilder/build.py:495
+#: pkgbuilder/build.py:496
 msgid "found in the AUR"
 msgstr ""
 
-#: pkgbuilder/build.py:498
+#: pkgbuilder/build.py:499
 msgid "none found"
 msgstr ""
 

diff --git a/locale/cs/LC_MESSAGES/pkgbuilder.mo b/locale/cs/LC_MESSAGES/pkgbuilder.mo