v4.3.1: Honor --ignore with VCS upgrades

Signed-off-by: Chris Warrick <[email protected]>
Kwpolska · Aug 29, 2021 · 3f82412 · 3f82412
1 parent 10f926f
commit 3f82412
Show file tree

Hide file tree

Showing 68 changed files with 294 additions and 288 deletions.
diff --git a/.pbwrapperhelp b/.pbwrapperhelp
@@ -22,7 +22,7 @@ options:
       --assume-installed <package=version>
                        add a virtual package to satisfy dependencies
       --cachedir <dir> set an alternate package cache location
-      --color <when>   colourise the output
+      --color <when>   colorize the output
       --config <path>  set an alternate configuration file
       --confirm        always ask for confirmation
       --dbonly         only modify database entries, not package files
@@ -39,7 +39,7 @@ options:
       --noconfirm      do not ask for any confirmation
       --noprogressbar  do not show a progress bar when downloading files
       --noscriptlet    do not execute the install scriptlet if one exists
-      --overwrite <path>
+      --overwrite <glob>
                        overwrite conflicting files (can be used more than once)
       --print-format <string>
                        specify how the targets should be printed
@@ -51,7 +51,7 @@ usage: pkgbuilder [-h] [-V] [-S] [-F] [--userfetch USER] [-i] [-s] [-u] [-U]
                   [--pgpcheck] [--skippgpcheck] [--confirm] [--noconfirm]
                   [--shallow] [--deep] [--ignore PACKAGE] [-y] [--notmp]
                   [--build]
-                  [PACKAGE [PACKAGE ...]]
+                  [PACKAGE ...]
 
 An AUR helper (and library) in Python 3.
 

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -5,8 +5,8 @@ Appendix C. Changelog
 :Author: Chris Warrick <[email protected]>
 :Copyright: © 2011-2021, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2021-01-01
-:Version: 4.3.0
+:Date: 2021-08-30
+:Version: 4.3.1
 
 .. index:: CHANGELOG
 
@@ -47,6 +47,9 @@ More information can be found on GitHub in the `releases section <https://github
 Version History
 ===============
 
+4.3.1
+    Honor --ignore with VCS upgrades (#67)
+
 4.3.0
     * Support for editing PKGBUILDs (``--edit-pkgbuild`` option)
 

diff --git a/PKGBUILD b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Chris Warrick <[email protected]>
 pkgname=pkgbuilder
 _pyname=pkgbuilder
-pkgver=4.3.0
+pkgver=4.3.1
 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=('9c0c6d2d1253fd88fce234d50d83fa5f')
+md5sums=('cffe174638f09983d1b4bd031ed63833')
 
 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.3.0
+pkgver=4.3.1
 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 <[email protected]>
-:Date: 2021-01-01
-:Version: 4.3.0
+:Date: 2021-08-30
+:Version: 4.3.1
 
 .. 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 <[email protected]>
-:Date: 2021-01-01
-:Version: 4.3.0
+:Date: 2021-08-30
+:Version: 4.3.1
 
 .. index: README
 

diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
@@ -5,8 +5,8 @@ Appendix C. Changelog
 :Author: Chris Warrick <[email protected]>
 :Copyright: © 2011-2021, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2021-01-01
-:Version: 4.3.0
+:Date: 2021-08-30
+:Version: 4.3.1
 
 .. index:: CHANGELOG
 
@@ -47,6 +47,9 @@ More information can be found on GitHub in the `releases section <https://github
 Version History
 ===============
 
+4.3.1
+    Honor --ignore with VCS upgrades (#67)
+
 4.3.0
     * Support for editing PKGBUILDs (``--edit-pkgbuild`` option)
 

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 <[email protected]>
-:Date: 2021-01-01
-:Version: 4.3.0
+:Date: 2021-08-30
+:Version: 4.3.1
 
 .. 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 <[email protected]>
-:Date: 2021-01-01
-:Version: 4.3.0
+:Date: 2021-08-30
+:Version: 4.3.1
 
 .. index: README
 

diff --git a/docs/aur.rst b/docs/aur.rst
@@ -4,8 +4,8 @@ aur module (AUR class)
 :Author: Chris Warrick <[email protected]>
 :Copyright: © 2011-2021, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2021-01-01
-:Version: 4.3.0
+:Date: 2021-08-30
+:Version: 4.3.1
 
 .. index:: AUR; RPC
 .. index:: RPC

diff --git a/docs/build.rst b/docs/build.rst
@@ -5,8 +5,8 @@ build module
 :Author: Chris Warrick <[email protected]>
 :Copyright: © 2011-2021, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2021-01-01
-:Version: 4.3.0
+:Date: 2021-08-30
+:Version: 4.3.1
 
 .. 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.3.0'
+version = '4.3.1'
 # The full version, including alpha/beta/rc tags.
-release = '4.3.0'
+release = '4.3.1'
 
 # 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 <[email protected]>
 :Copyright: © 2011-2021, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2021-01-01
-:Version: 4.3.0
+:Date: 2021-08-30
+:Version: 4.3.1
 
 .. 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 <[email protected]>
 :Copyright: © 2011-2021, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2021-01-01
-:Version: 4.3.0
+:Date: 2021-08-30
+:Version: 4.3.1
 
 .. 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 <[email protected]>
 :Copyright: © 2011-2021, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2021-01-01
-:Version: 4.3.0
+:Date: 2021-08-30
+:Version: 4.3.1
 
 .. 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 <[email protected]>
 :Copyright: © 2011-2021, Chris Warrick.
 :License: BSD (see /LICENSE or Appendix B.)
-:Date: 2021-01-01
-:Version: 4.3.0
+:Date: 2021-08-30
+:Version: 4.3.1
 :Wrapper Version: 0.5.6
 :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 <[email protected]>
 :Copyright: © 2011-2021, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2021-01-01
-:Version: 4.3.0
+:Date: 2021-08-30
+:Version: 4.3.1
 
 .. 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 <[email protected]>
 :Copyright: © 2011-2021, Chris Warrick.
 :License: BSD (see /LICENSE or Appendix B.)
-:Date: 2021-01-01
-:Version: 4.3.0
+:Date: 2021-08-30
+:Version: 4.3.1
 :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 <[email protected]>
 :Copyright: © 2011-2021, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2021-01-01
-:Version: 4.3.0
+:Date: 2021-08-30
+:Version: 4.3.1
 
 .. index:: sample scripts
 

diff --git a/docs/transaction.rst b/docs/transaction.rst
@@ -5,8 +5,8 @@ Transactions
 :Author: Chris Warrick <[email protected]>
 :Copyright: © 2011-2021, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2021-01-01
-:Version: 4.3.0
+:Date: 2021-08-30
+:Version: 4.3.1
 
 .. 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 <[email protected]>
 :Copyright: © 2011-2021, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2021-01-01
-:Version: 4.3.0
+:Date: 2021-08-30
+:Version: 4.3.1
 
 .. 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 <[email protected]>
 :Copyright: © 2011-2021, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2021-01-01
-:Version: 4.3.0
+:Date: 2021-08-30
+:Version: 4.3.1
 
 .. index:: upgrade
 .. index:: Syu

diff --git a/docs/utils.rst b/docs/utils.rst
@@ -5,8 +5,8 @@ utils module
 :Author: Chris Warrick <[email protected]>
 :Copyright: © 2011-2021, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2021-01-01
-:Version: 4.3.0
+:Date: 2021-08-30
+:Version: 4.3.1
 
 .. 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 <[email protected]>
 :Copyright: © 2011-2021, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2021-01-01
-:Version: 4.3.0
+:Date: 2021-08-30
+:Version: 4.3.1
 :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
@@ -6,9 +6,9 @@
 # وجدي أبو سلطان, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: 4.3.0\n"
+"Project-Id-Version: 4.3.1\n"
 "Report-Msgid-Bugs-To: Chris Warrick <[email protected]>\n"
-"POT-Creation-Date: 2019-01-12 16:05+0100\n"
+"POT-Creation-Date: 2021-08-30 01:01+0200\n"
 "PO-Revision-Date: 2019-01-12 14:40+0000\n"
 "Last-Translator: Chris Warrick\n"
 "Language-Team: Arabic (http://www.transifex.com/kwpolska/pkgbuilder/language/"
@@ -90,7 +90,7 @@ msgstr "تم جلبها بنجاح:"
 msgid "Edit PKGBUILD of {0}? [Y/n] "
 msgstr ""
 
-#: pkgbuilder/build.py:429 pkgbuilder/upgrade.py:212
+#: pkgbuilder/build.py:429 pkgbuilder/upgrade.py:220
 msgid "Proceed with installation? [Y/n] "
 msgstr "مواصلة التثبيت؟ [Y/n] "
 
@@ -521,56 +521,56 @@ msgstr ""
 msgid "{0}: outdated {1}"
 msgstr ""
 
-#: pkgbuilder/upgrade.py:119
+#: pkgbuilder/upgrade.py:127
 msgid "Synchronizing package databases..."
 msgstr "يزامن قواعد بيانات الحزمة ..."
 
-#: pkgbuilder/upgrade.py:125
+#: pkgbuilder/upgrade.py:133
 msgid "Starting full system upgrade..."
 msgstr "يبدأ ترقية النظام بالكامل ..."
 
-#: pkgbuilder/upgrade.py:128
+#: pkgbuilder/upgrade.py:136
 #, python-brace-format
 msgid "warning: {0}: ignoring package upgrade ({1} => {2})"
 msgstr ""
 
-#: pkgbuilder/upgrade.py:134
+#: pkgbuilder/upgrade.py:142
 #, python-brace-format
 msgid "warning: {0}: downgrading from version {1} to version {2}"
 msgstr ""
 
-#: pkgbuilder/upgrade.py:137
+#: pkgbuilder/upgrade.py:145
 #, python-brace-format
 msgid "warning: {0}: local ({1}) is newer than aur ({2})"
 msgstr ""
 
-#: pkgbuilder/upgrade.py:145
+#: pkgbuilder/upgrade.py:153
 msgid "there is nothing to do"
 msgstr "ليس هناك ما يجب القيام به"
 
-#: pkgbuilder/upgrade.py:155
+#: pkgbuilder/upgrade.py:163
 #, python-brace-format
 msgid "Targets ({0}):"
 msgstr "المقاصد ({0}):"
 
-#: pkgbuilder/upgrade.py:169
+#: pkgbuilder/upgrade.py:177
 msgid "Name"
 msgstr "الاسم"
 
-#: pkgbuilder/upgrade.py:169
+#: pkgbuilder/upgrade.py:177
 msgid "Old Version"
 msgstr "الإصدار قديم"
 
-#: pkgbuilder/upgrade.py:169
+#: pkgbuilder/upgrade.py:177
 msgid "New Version"
 msgstr "الإصدار جديد"
 
 #. string stolen from pacman
-#: pkgbuilder/upgrade.py:192
+#: pkgbuilder/upgrade.py:200
 msgid "warning: insufficient columns available for table display"
 msgstr "تحذير: توفر أعمدة غير كافية لعرض الجدول"
 
-#: pkgbuilder/upgrade.py:210
+#: pkgbuilder/upgrade.py:218
 msgid "Fetch the packages? [Y/n] "
 msgstr "جلب الحزم؟ [Y/n]"
 

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