diff --git a/.pbwrapperhelp b/.pbwrapperhelp index d8e13ab..20f44ad 100644 --- a/.pbwrapperhelp +++ b/.pbwrapperhelp @@ -51,50 +51,51 @@ usage: pkgbuilder [-h] [-V] [-S] [-F] [--userfetch USER] [-i] [-s] [-u] [-U] An AUR helper (and library) in Python 3. positional arguments: - PACKAGE AUR/repository packages to build + PACKAGE AUR/repository packages to build optional arguments: - -h, --help show this help message and exit - -V, --version show version number and quit + -h, --help show this help message and exit + -V, --version show version number and quit operations: - -S, --sync build in /tmp - -F, --fetch fetch package files - --userfetch USER fetch all package files of an user - -i, --info view package information - -s, --search search the AUR for matching strings - -u, --sysupgrade upgrade installed AUR packages - -U, --upgrade move package files to pacman cache and install them - -X, --runtx run transactions from .tx files + -S, --sync build in /tmp + -F, --fetch, -G, --get + fetch package files + --userfetch USER fetch all package files of an user + -i, --info view package information + -s, --search search the AUR for matching strings + -u, --sysupgrade upgrade installed AUR packages + -U, --upgrade move package files to pacman cache and install them + -X, --runtx run transactions from .tx files options: - -c, --clean clean up work files before and after build - --noclean don't clean up work files before and after build - (default) - --colors use colors in output (default) - -C, --nocolors don't use colors in output - --debug display debug messages - --nodebug don't display debug messages (default) - --depcheck check dependencies (default) - -d, --nodepcheck don't check dependencies (may break makepkg) - -D, --vcsupgrade upgrade all the VCS/date-versioned packages - --novcsupgrade don't upgrade all the VCS/date-versioned packages - (default) - --validation check if packages were installed after build (default) - -v, --novalidation don't check if packages were installed after build - --install install packages after building (default) - -w, --buildonly don't install packages after building - --pgpcheck verify source files with PGP signatures (default) - --skippgpcheck do not verify source files with PGP signatures - --confirm ask for confirmation (default) - --noconfirm do not ask for any confirmation - --shallow use shallow git clones (default) - --deep use deep git clones - --ignore PACKAGE ignore a package upgrade (can be used more than once) - -y, --refresh (dummy) + -c, --clean clean up work files before and after build + --noclean don't clean up work files before and after build + (default) + --colors use colors in output (default) + -C, --nocolors don't use colors in output + --debug display debug messages + --nodebug don't display debug messages (default) + --depcheck check dependencies (default) + -d, --nodepcheck don't check dependencies (may break makepkg) + -D, --vcsupgrade upgrade all the VCS/date-versioned packages + --novcsupgrade don't upgrade all the VCS/date-versioned packages + (default) + --validation check if packages were installed after build (default) + -v, --novalidation don't check if packages were installed after build + --install install packages after building (default) + -w, --buildonly don't install packages after building + --pgpcheck verify source files with PGP signatures (default) + --skippgpcheck do not verify source files with PGP signatures + --confirm ask for confirmation (default) + --noconfirm do not ask for any confirmation + --shallow use shallow git clones (default) + --deep use deep git clones + --ignore PACKAGE ignore a package upgrade (can be used more than once) + -y, --refresh (dummy) configuration overrides: - --notmp don't build in /tmp - --build build (instead of fetching) + --notmp don't build in /tmp + --build build (instead of fetching) Also accepts repository packages to build from source. diff --git a/.pytest_cache/v/cache/nodeids b/.pytest_cache/v/cache/nodeids new file mode 100644 index 0000000..bc5701b --- /dev/null +++ b/.pytest_cache/v/cache/nodeids @@ -0,0 +1,11 @@ +[ + "tests/test_pkgbuilder.py::TestPB::test_aur", + "tests/test_pkgbuilder.py::TestPB::test_call_pacman", + "tests/test_pkgbuilder.py::TestPB::test_main", + "tests/test_pkgbuilder.py::TestPB::test_pb_help", + "tests/test_pkgbuilder.py::TestPB::test_pbds", + "tests/test_pkgbuilder.py::TestPB::test_pbds_logging", + "tests/test_pkgbuilder.py::TestPB::test_utils_print_package_info", + "tests/test_pkgbuilder.py::TestPB::test_utils_print_package_search", + "tests/test_pkgbuilder.py::TestPB::test_wrapper" +] \ No newline at end of file diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 9a6750c..c05b56c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,8 +5,8 @@ Appendix C. Changelog :Author: Chris Warrick :Copyright: © 2011-2018, Chris Warrick. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2018-03-18 -:Version: 4.2.16 +:Date: 2018-03-25 +:Version: 4.2.17 .. index:: CHANGELOG @@ -47,6 +47,10 @@ More information can be found on GitHub in the `releases section pkgname=pkgbuilder _pyname=pkgbuilder -pkgver=4.2.16 +pkgver=4.2.17 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=('6edf62b5f6cf72a9ab69656ea424b2d2') +md5sums=('b3b2b808f80f334c32aa5f719779ee05') package() { cd "${srcdir}/${_pyname}-${pkgver}" diff --git a/PKGBUILD-git b/PKGBUILD-git index 36c4c61..019172c 100644 --- a/PKGBUILD-git +++ b/PKGBUILD-git @@ -2,7 +2,7 @@ pkgname=pkgbuilder-git _pyname=pkgbuilder _gitname=pkgbuilder -pkgver=4.2.16 +pkgver=4.2.17 pkgrel=1 pkgdesc='A Python AUR helper/library. (git version)' arch=('any') diff --git a/README b/README index 6154b6f..af4a83c 100644 --- 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 -:Date: 2018-03-18 -:Version: 4.2.16 +:Date: 2018-03-25 +:Version: 4.2.17 .. index: README diff --git a/README.rst b/README.rst index 6154b6f..af4a83c 100644 --- 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 -:Date: 2018-03-18 -:Version: 4.2.16 +:Date: 2018-03-25 +:Version: 4.2.17 .. index: README diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 9a6750c..c05b56c 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -5,8 +5,8 @@ Appendix C. Changelog :Author: Chris Warrick :Copyright: © 2011-2018, Chris Warrick. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2018-03-18 -:Version: 4.2.16 +:Date: 2018-03-25 +:Version: 4.2.17 .. index:: CHANGELOG @@ -47,6 +47,10 @@ More information can be found on GitHub in the `releases section -:Date: 2018-03-18 -:Version: 4.2.16 +:Date: 2018-03-25 +:Version: 4.2.17 .. index:: LICENSE diff --git a/docs/README.rst b/docs/README.rst index 6154b6f..af4a83c 100644 --- 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 -:Date: 2018-03-18 -:Version: 4.2.16 +:Date: 2018-03-25 +:Version: 4.2.17 .. index: README diff --git a/docs/aur.rst b/docs/aur.rst index 04e64b8..4fb590c 100644 --- a/docs/aur.rst +++ b/docs/aur.rst @@ -4,8 +4,8 @@ aur module (AUR class) :Author: Chris Warrick :Copyright: © 2011-2018, Chris Warrick. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2018-03-18 -:Version: 4.2.16 +:Date: 2018-03-25 +:Version: 4.2.17 .. index:: AUR; RPC .. index:: RPC diff --git a/docs/build.rst b/docs/build.rst index 32a1f0d..8978896 100644 --- a/docs/build.rst +++ b/docs/build.rst @@ -5,8 +5,8 @@ build module :Author: Chris Warrick :Copyright: © 2011-2018, Chris Warrick. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2018-03-18 -:Version: 4.2.16 +:Date: 2018-03-25 +:Version: 4.2.17 .. index:: build .. versionadded:: 2.1.0.0 diff --git a/docs/conf.py b/docs/conf.py index da377e0..78c111a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -48,9 +48,9 @@ # built documents. # # The short X.Y version. -version = '4.2.16' +version = '4.2.17' # The full version, including alpha/beta/rc tags. -release = '4.2.16' +release = '4.2.17' # 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 f274365..34c34d5 100644 --- a/docs/exceptions.rst +++ b/docs/exceptions.rst @@ -5,8 +5,8 @@ Exceptions in PKGBUILDer :Author: Chris Warrick :Copyright: © 2011-2018, Chris Warrick. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2018-03-18 -:Version: 4.2.16 +:Date: 2018-03-25 +:Version: 4.2.17 .. index:: Exceptions .. versionadded:: 3.0.0 diff --git a/docs/main.rst b/docs/main.rst index 2cc305f..d6c6973 100644 --- a/docs/main.rst +++ b/docs/main.rst @@ -4,8 +4,8 @@ __main__ module :Author: Chris Warrick :Copyright: © 2011-2018, Chris Warrick. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2018-03-18 -:Version: 4.2.16 +:Date: 2018-03-25 +:Version: 4.2.17 .. index:: main .. versionchanged:: 4.0.0 diff --git a/docs/package.rst b/docs/package.rst index 190a5db..509a1ce 100644 --- a/docs/package.rst +++ b/docs/package.rst @@ -5,8 +5,8 @@ package module (Package, AURPackage, ABSPackage classes) :Author: Chris Warrick :Copyright: © 2011-2018, Chris Warrick. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2018-03-18 -:Version: 4.2.16 +:Date: 2018-03-25 +:Version: 4.2.17 .. index:: Package .. index:: AURPackage diff --git a/docs/pb.8.gz b/docs/pb.8.gz index 30b0323..6ba4db0 100644 Binary files a/docs/pb.8.gz and b/docs/pb.8.gz differ diff --git a/docs/pb.rst b/docs/pb.rst index 3bda84a..f347b3e 100644 --- a/docs/pb.rst +++ b/docs/pb.rst @@ -6,8 +6,8 @@ PBWrapper :Author: Chris Warrick :Copyright: © 2011-2018, Chris Warrick. :License: BSD (see /LICENSE or Appendix B.) -:Date: 2018-03-18 -:Version: 4.2.16 +:Date: 2018-03-25 +:Version: 4.2.17 :Wrapper Version: 0.5.3 :Manual section: 8 :Manual group: PKGBUILDer manual diff --git a/docs/pbds.rst b/docs/pbds.rst index 0f3dd7b..3abb8fb 100644 --- a/docs/pbds.rst +++ b/docs/pbds.rst @@ -5,8 +5,8 @@ pbds module (PBDS class) :Author: Chris Warrick :Copyright: © 2011-2018, Chris Warrick. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2018-03-18 -:Version: 4.2.16 +:Date: 2018-03-25 +:Version: 4.2.17 .. module: pbds diff --git a/docs/pkgbuilder.8.gz b/docs/pkgbuilder.8.gz index e93c7c7..18275c6 100644 Binary files a/docs/pkgbuilder.8.gz and b/docs/pkgbuilder.8.gz differ diff --git a/docs/pkgbuilder.rst b/docs/pkgbuilder.rst index 475aa28..98f321a 100644 --- a/docs/pkgbuilder.rst +++ b/docs/pkgbuilder.rst @@ -6,8 +6,8 @@ PKGBUILDer :Author: Chris Warrick :Copyright: © 2011-2018, Chris Warrick. :License: BSD (see /LICENSE or Appendix B.) -:Date: 2018-03-18 -:Version: 4.2.16 +:Date: 2018-03-25 +:Version: 4.2.17 :Manual section: 8 :Manual group: PKGBUILDer manual @@ -48,7 +48,7 @@ OPERATIONS **-S, --sync** Build packages in */tmp* instead of CWD. Override with ``--notmp``. -**-F, --fetch** +**-F, --fetch, -G, --get** Fetch (and don't build) **PACKAGE**\s in a fashion similar to ``cower -d``. Override with ``--nofetch``. @@ -150,7 +150,7 @@ pkgbuilder -SF hello pkgbuilder python Python is a binary repo package, triggering a package download from ASP. - -S and/or -F are also accepted. + -S and/or -F/-G are also accepted. pkgbuilder -Syu Check for updates and offer installing them. diff --git a/docs/sample-scripts.rst b/docs/sample-scripts.rst index 9788cef..444c60c 100644 --- a/docs/sample-scripts.rst +++ b/docs/sample-scripts.rst @@ -4,8 +4,8 @@ PKGBUILDer Sample Scripts :Author: Chris Warrick :Copyright: © 2011-2018, Chris Warrick. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2018-03-18 -:Version: 4.2.16 +:Date: 2018-03-25 +:Version: 4.2.17 .. index:: sample scripts diff --git a/docs/transaction.rst b/docs/transaction.rst index 5af9dc4..f666733 100644 --- a/docs/transaction.rst +++ b/docs/transaction.rst @@ -5,8 +5,8 @@ Transactions :Author: Chris Warrick :Copyright: © 2011-2018, Chris Warrick. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2018-03-18 -:Version: 4.2.16 +:Date: 2018-03-25 +:Version: 4.2.17 .. index:: transaction .. versionadded:: 4.1.0 diff --git a/docs/ui.rst b/docs/ui.rst index 3896716..8ed6dbb 100644 --- a/docs/ui.rst +++ b/docs/ui.rst @@ -5,8 +5,8 @@ ui module (UI class) :Author: Chris Warrick :Copyright: © 2011-2018, Chris Warrick. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2018-03-18 -:Version: 4.2.16 +:Date: 2018-03-25 +:Version: 4.2.17 .. index:: UI .. versionadded:: 3.0.0 diff --git a/docs/upgrade.rst b/docs/upgrade.rst index 7e71282..6dfc33c 100644 --- a/docs/upgrade.rst +++ b/docs/upgrade.rst @@ -5,8 +5,8 @@ upgrade module :Author: Chris Warrick :Copyright: © 2011-2018, Chris Warrick. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2018-03-18 -:Version: 4.2.16 +:Date: 2018-03-25 +:Version: 4.2.17 .. index:: upgrade .. index:: Syu diff --git a/docs/utils.rst b/docs/utils.rst index 177de74..033354a 100644 --- a/docs/utils.rst +++ b/docs/utils.rst @@ -5,8 +5,8 @@ utils module :Author: Chris Warrick :Copyright: © 2011-2018, Chris Warrick. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2018-03-18 -:Version: 4.2.16 +:Date: 2018-03-25 +:Version: 4.2.17 .. index:: utils .. versionadded:: 2.1.0.0 diff --git a/docs/wrapper.rst b/docs/wrapper.rst index a5b29f6..3ec5c53 100644 --- a/docs/wrapper.rst +++ b/docs/wrapper.rst @@ -4,8 +4,8 @@ PBWrapper :Author: Chris Warrick :Copyright: © 2011-2018, Chris Warrick. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2018-03-18 -:Version: 4.2.16 +:Date: 2018-03-25 +:Version: 4.2.17 :PBWrapper Version: 0.2.3 .. index:: wrapper diff --git a/locale/ar/LC_MESSAGES/pkgbuilder.mo b/locale/ar/LC_MESSAGES/pkgbuilder.mo index 5092079..bfaa41a 100644 Binary files a/locale/ar/LC_MESSAGES/pkgbuilder.mo and b/locale/ar/LC_MESSAGES/pkgbuilder.mo differ diff --git a/locale/ar/LC_MESSAGES/pkgbuilder.po b/locale/ar/LC_MESSAGES/pkgbuilder.po index a9abd3f..f15eda9 100644 --- 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.2.16\n" +"Project-Id-Version: 4.2.17\n" "Report-Msgid-Bugs-To: Chris Warrick \n" -"POT-Creation-Date: 2018-03-18 14:30+0100\n" +"POT-Creation-Date: 2018-03-25 11:40+0200\n" "PO-Revision-Date: 2018-03-18 13:23+0000\n" "Last-Translator: Chris Warrick\n" "Language-Team: Arabic (http://www.transifex.com/kwpolska/pkgbuilder/language/" diff --git a/locale/cs/LC_MESSAGES/pkgbuilder.mo b/locale/cs/LC_MESSAGES/pkgbuilder.mo index d1dca93..b25f880 100644 Binary files a/locale/cs/LC_MESSAGES/pkgbuilder.mo and b/locale/cs/LC_MESSAGES/pkgbuilder.mo differ diff --git a/locale/cs/LC_MESSAGES/pkgbuilder.po b/locale/cs/LC_MESSAGES/pkgbuilder.po index 7328dfa..d365bfe 100644 --- a/locale/cs/LC_MESSAGES/pkgbuilder.po +++ b/locale/cs/LC_MESSAGES/pkgbuilder.po @@ -6,9 +6,9 @@ # LiberteCzech , 2016 msgid "" msgstr "" -"Project-Id-Version: 4.2.16\n" +"Project-Id-Version: 4.2.17\n" "Report-Msgid-Bugs-To: Chris Warrick \n" -"POT-Creation-Date: 2018-03-18 14:30+0100\n" +"POT-Creation-Date: 2018-03-25 11:40+0200\n" "PO-Revision-Date: 2018-03-18 13:23+0000\n" "Last-Translator: Chris Warrick\n" "Language-Team: Czech (http://www.transifex.com/kwpolska/pkgbuilder/language/" diff --git a/locale/de/LC_MESSAGES/pkgbuilder.mo b/locale/de/LC_MESSAGES/pkgbuilder.mo index d4cb108..a003bce 100644 Binary files a/locale/de/LC_MESSAGES/pkgbuilder.mo and b/locale/de/LC_MESSAGES/pkgbuilder.mo differ diff --git a/locale/de/LC_MESSAGES/pkgbuilder.po b/locale/de/LC_MESSAGES/pkgbuilder.po index a0aef4a..7860691 100644 --- a/locale/de/LC_MESSAGES/pkgbuilder.po +++ b/locale/de/LC_MESSAGES/pkgbuilder.po @@ -6,9 +6,9 @@ # Max Mustermann , 2013 msgid "" msgstr "" -"Project-Id-Version: 4.2.16\n" +"Project-Id-Version: 4.2.17\n" "Report-Msgid-Bugs-To: Chris Warrick \n" -"POT-Creation-Date: 2018-03-18 14:30+0100\n" +"POT-Creation-Date: 2018-03-25 11:40+0200\n" "PO-Revision-Date: 2018-03-18 13:23+0000\n" "Last-Translator: Chris Warrick\n" "Language-Team: German (http://www.transifex.com/kwpolska/pkgbuilder/language/" diff --git a/locale/es/LC_MESSAGES/pkgbuilder.mo b/locale/es/LC_MESSAGES/pkgbuilder.mo index 45f0f92..fbbf8a7 100644 Binary files a/locale/es/LC_MESSAGES/pkgbuilder.mo and b/locale/es/LC_MESSAGES/pkgbuilder.mo differ diff --git a/locale/es/LC_MESSAGES/pkgbuilder.po b/locale/es/LC_MESSAGES/pkgbuilder.po index 538c416..bb653d7 100644 --- a/locale/es/LC_MESSAGES/pkgbuilder.po +++ b/locale/es/LC_MESSAGES/pkgbuilder.po @@ -14,9 +14,9 @@ # tufadorin , 2013 msgid "" msgstr "" -"Project-Id-Version: 4.2.16\n" +"Project-Id-Version: 4.2.17\n" "Report-Msgid-Bugs-To: Chris Warrick \n" -"POT-Creation-Date: 2018-03-18 14:30+0100\n" +"POT-Creation-Date: 2018-03-25 11:40+0200\n" "PO-Revision-Date: 2018-03-18 13:23+0000\n" "Last-Translator: Chris Warrick\n" "Language-Team: Spanish (http://www.transifex.com/kwpolska/pkgbuilder/" diff --git a/locale/id/LC_MESSAGES/pkgbuilder.mo b/locale/id/LC_MESSAGES/pkgbuilder.mo index 43dce8c..6f26bff 100644 Binary files a/locale/id/LC_MESSAGES/pkgbuilder.mo and b/locale/id/LC_MESSAGES/pkgbuilder.mo differ diff --git a/locale/id/LC_MESSAGES/pkgbuilder.po b/locale/id/LC_MESSAGES/pkgbuilder.po index 8f6f84f..8ff6327 100644 --- a/locale/id/LC_MESSAGES/pkgbuilder.po +++ b/locale/id/LC_MESSAGES/pkgbuilder.po @@ -5,9 +5,9 @@ # Translators: msgid "" msgstr "" -"Project-Id-Version: 4.2.16\n" +"Project-Id-Version: 4.2.17\n" "Report-Msgid-Bugs-To: Chris Warrick \n" -"POT-Creation-Date: 2018-03-18 14:30+0100\n" +"POT-Creation-Date: 2018-03-25 11:40+0200\n" "PO-Revision-Date: 2018-03-18 13:23+0000\n" "Last-Translator: Chris Warrick\n" "Language-Team: Indonesian (http://www.transifex.com/kwpolska/pkgbuilder/" diff --git a/locale/it/LC_MESSAGES/pkgbuilder.mo b/locale/it/LC_MESSAGES/pkgbuilder.mo index 434cd13..ce2877a 100644 Binary files a/locale/it/LC_MESSAGES/pkgbuilder.mo and b/locale/it/LC_MESSAGES/pkgbuilder.mo differ diff --git a/locale/it/LC_MESSAGES/pkgbuilder.po b/locale/it/LC_MESSAGES/pkgbuilder.po index 76dc2ed..72e707f 100644 --- a/locale/it/LC_MESSAGES/pkgbuilder.po +++ b/locale/it/LC_MESSAGES/pkgbuilder.po @@ -10,9 +10,9 @@ # Chris Warrick, 2013 msgid "" msgstr "" -"Project-Id-Version: 4.2.16\n" +"Project-Id-Version: 4.2.17\n" "Report-Msgid-Bugs-To: Chris Warrick \n" -"POT-Creation-Date: 2018-03-18 14:30+0100\n" +"POT-Creation-Date: 2018-03-25 11:40+0200\n" "PO-Revision-Date: 2018-03-18 13:23+0000\n" "Last-Translator: Chris Warrick\n" "Language-Team: Italian (http://www.transifex.com/kwpolska/pkgbuilder/" diff --git a/locale/ja/LC_MESSAGES/pkgbuilder.mo b/locale/ja/LC_MESSAGES/pkgbuilder.mo index 90ce65c..e067a6b 100644 Binary files a/locale/ja/LC_MESSAGES/pkgbuilder.mo and b/locale/ja/LC_MESSAGES/pkgbuilder.mo differ diff --git a/locale/ja/LC_MESSAGES/pkgbuilder.po b/locale/ja/LC_MESSAGES/pkgbuilder.po index c6571e1..28e8a18 100644 --- a/locale/ja/LC_MESSAGES/pkgbuilder.po +++ b/locale/ja/LC_MESSAGES/pkgbuilder.po @@ -5,9 +5,9 @@ # Translators: msgid "" msgstr "" -"Project-Id-Version: 4.2.16\n" +"Project-Id-Version: 4.2.17\n" "Report-Msgid-Bugs-To: Chris Warrick \n" -"POT-Creation-Date: 2018-03-18 14:30+0100\n" +"POT-Creation-Date: 2018-03-25 11:40+0200\n" "PO-Revision-Date: 2018-03-18 13:23+0000\n" "Last-Translator: Chris Warrick\n" "Language-Team: Japanese (http://www.transifex.com/kwpolska/pkgbuilder/" diff --git a/locale/pl/LC_MESSAGES/pkgbuilder.mo b/locale/pl/LC_MESSAGES/pkgbuilder.mo index f45f223..7cc8e94 100644 Binary files a/locale/pl/LC_MESSAGES/pkgbuilder.mo and b/locale/pl/LC_MESSAGES/pkgbuilder.mo differ diff --git a/locale/pl/LC_MESSAGES/pkgbuilder.po b/locale/pl/LC_MESSAGES/pkgbuilder.po index 9dd2dcb..8ce0c43 100644 --- a/locale/pl/LC_MESSAGES/pkgbuilder.po +++ b/locale/pl/LC_MESSAGES/pkgbuilder.po @@ -8,9 +8,9 @@ # Chris Warrick, 2013 msgid "" msgstr "" -"Project-Id-Version: 4.2.16\n" +"Project-Id-Version: 4.2.17\n" "Report-Msgid-Bugs-To: Chris Warrick \n" -"POT-Creation-Date: 2018-03-18 14:30+0100\n" +"POT-Creation-Date: 2018-03-25 11:40+0200\n" "PO-Revision-Date: 2018-03-18 13:26+0000\n" "Last-Translator: Chris Warrick\n" "Language-Team: Polish (http://www.transifex.com/kwpolska/pkgbuilder/language/" diff --git a/locale/pt/LC_MESSAGES/pkgbuilder.mo b/locale/pt/LC_MESSAGES/pkgbuilder.mo index b85010e..5f51d8a 100644 Binary files a/locale/pt/LC_MESSAGES/pkgbuilder.mo and b/locale/pt/LC_MESSAGES/pkgbuilder.mo differ diff --git a/locale/pt/LC_MESSAGES/pkgbuilder.po b/locale/pt/LC_MESSAGES/pkgbuilder.po index 23c34b0..268210c 100644 --- a/locale/pt/LC_MESSAGES/pkgbuilder.po +++ b/locale/pt/LC_MESSAGES/pkgbuilder.po @@ -6,9 +6,9 @@ # Thiago Perrotta , 2015 msgid "" msgstr "" -"Project-Id-Version: 4.2.16\n" +"Project-Id-Version: 4.2.17\n" "Report-Msgid-Bugs-To: Chris Warrick \n" -"POT-Creation-Date: 2018-03-18 14:30+0100\n" +"POT-Creation-Date: 2018-03-25 11:40+0200\n" "PO-Revision-Date: 2018-03-18 13:23+0000\n" "Last-Translator: Chris Warrick\n" "Language-Team: Portuguese (http://www.transifex.com/kwpolska/pkgbuilder/" diff --git a/locale/pt_BR/LC_MESSAGES/pkgbuilder.mo b/locale/pt_BR/LC_MESSAGES/pkgbuilder.mo index c68fc3c..f860c78 100644 Binary files a/locale/pt_BR/LC_MESSAGES/pkgbuilder.mo and b/locale/pt_BR/LC_MESSAGES/pkgbuilder.mo differ diff --git a/locale/pt_BR/LC_MESSAGES/pkgbuilder.po b/locale/pt_BR/LC_MESSAGES/pkgbuilder.po index 696183b..1820de0 100644 --- a/locale/pt_BR/LC_MESSAGES/pkgbuilder.po +++ b/locale/pt_BR/LC_MESSAGES/pkgbuilder.po @@ -7,9 +7,9 @@ # Uberlan Soares , 2016 msgid "" msgstr "" -"Project-Id-Version: 4.2.16\n" +"Project-Id-Version: 4.2.17\n" "Report-Msgid-Bugs-To: Chris Warrick \n" -"POT-Creation-Date: 2018-03-18 14:30+0100\n" +"POT-Creation-Date: 2018-03-25 11:40+0200\n" "PO-Revision-Date: 2018-03-18 13:23+0000\n" "Last-Translator: Chris Warrick\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/kwpolska/" diff --git a/locale/sk/LC_MESSAGES/pkgbuilder.mo b/locale/sk/LC_MESSAGES/pkgbuilder.mo index ffa417d..2405fd7 100644 Binary files a/locale/sk/LC_MESSAGES/pkgbuilder.mo and b/locale/sk/LC_MESSAGES/pkgbuilder.mo differ diff --git a/locale/sk/LC_MESSAGES/pkgbuilder.po b/locale/sk/LC_MESSAGES/pkgbuilder.po index 6f7ab53..c6f52d0 100644 --- a/locale/sk/LC_MESSAGES/pkgbuilder.po +++ b/locale/sk/LC_MESSAGES/pkgbuilder.po @@ -5,9 +5,9 @@ # Translators: msgid "" msgstr "" -"Project-Id-Version: 4.2.16\n" +"Project-Id-Version: 4.2.17\n" "Report-Msgid-Bugs-To: Chris Warrick \n" -"POT-Creation-Date: 2018-03-18 14:30+0100\n" +"POT-Creation-Date: 2018-03-25 11:40+0200\n" "PO-Revision-Date: 2018-03-18 13:23+0000\n" "Last-Translator: Chris Warrick\n" "Language-Team: Slovak (http://www.transifex.com/kwpolska/pkgbuilder/language/" diff --git a/locale/sv/LC_MESSAGES/pkgbuilder.mo b/locale/sv/LC_MESSAGES/pkgbuilder.mo index 6ded524..7a4a895 100644 Binary files a/locale/sv/LC_MESSAGES/pkgbuilder.mo and b/locale/sv/LC_MESSAGES/pkgbuilder.mo differ diff --git a/locale/sv/LC_MESSAGES/pkgbuilder.po b/locale/sv/LC_MESSAGES/pkgbuilder.po index 6b9ed81..e792116 100644 --- a/locale/sv/LC_MESSAGES/pkgbuilder.po +++ b/locale/sv/LC_MESSAGES/pkgbuilder.po @@ -5,9 +5,9 @@ # Translators: msgid "" msgstr "" -"Project-Id-Version: 4.2.16\n" +"Project-Id-Version: 4.2.17\n" "Report-Msgid-Bugs-To: Chris Warrick \n" -"POT-Creation-Date: 2018-03-18 14:30+0100\n" +"POT-Creation-Date: 2018-03-25 11:40+0200\n" "PO-Revision-Date: 2018-03-18 13:23+0000\n" "Last-Translator: Chris Warrick\n" "Language-Team: Swedish (http://www.transifex.com/kwpolska/pkgbuilder/" diff --git a/locale/tr/LC_MESSAGES/pkgbuilder.mo b/locale/tr/LC_MESSAGES/pkgbuilder.mo index 015f623..2ea99f1 100644 Binary files a/locale/tr/LC_MESSAGES/pkgbuilder.mo and b/locale/tr/LC_MESSAGES/pkgbuilder.mo differ diff --git a/locale/tr/LC_MESSAGES/pkgbuilder.po b/locale/tr/LC_MESSAGES/pkgbuilder.po index a2494f9..12ebdc1 100644 --- a/locale/tr/LC_MESSAGES/pkgbuilder.po +++ b/locale/tr/LC_MESSAGES/pkgbuilder.po @@ -11,9 +11,9 @@ # Yusuf Faruk DOĞAN , 2013 msgid "" msgstr "" -"Project-Id-Version: 4.2.16\n" +"Project-Id-Version: 4.2.17\n" "Report-Msgid-Bugs-To: Chris Warrick \n" -"POT-Creation-Date: 2018-03-18 14:30+0100\n" +"POT-Creation-Date: 2018-03-25 11:40+0200\n" "PO-Revision-Date: 2018-03-18 13:23+0000\n" "Last-Translator: Chris Warrick\n" "Language-Team: Turkish (http://www.transifex.com/kwpolska/pkgbuilder/" diff --git a/locale/vi/LC_MESSAGES/pkgbuilder.mo b/locale/vi/LC_MESSAGES/pkgbuilder.mo index a0ffb07..23c4df0 100644 Binary files a/locale/vi/LC_MESSAGES/pkgbuilder.mo and b/locale/vi/LC_MESSAGES/pkgbuilder.mo differ diff --git a/locale/vi/LC_MESSAGES/pkgbuilder.po b/locale/vi/LC_MESSAGES/pkgbuilder.po index 18cadac..7f85d91 100644 --- a/locale/vi/LC_MESSAGES/pkgbuilder.po +++ b/locale/vi/LC_MESSAGES/pkgbuilder.po @@ -8,9 +8,9 @@ # Anh Phan , 2013 msgid "" msgstr "" -"Project-Id-Version: 4.2.16\n" +"Project-Id-Version: 4.2.17\n" "Report-Msgid-Bugs-To: Chris Warrick \n" -"POT-Creation-Date: 2018-03-18 14:30+0100\n" +"POT-Creation-Date: 2018-03-25 11:40+0200\n" "PO-Revision-Date: 2018-03-18 13:23+0000\n" "Last-Translator: Chris Warrick\n" "Language-Team: Vietnamese (http://www.transifex.com/kwpolska/pkgbuilder/" diff --git a/messages.pot b/messages.pot index aff81d7..a8238b6 100644 --- a/messages.pot +++ b/messages.pot @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: 4.2.16\n" +"Project-Id-Version: 4.2.17\n" "Report-Msgid-Bugs-To: Chris Warrick \n" -"POT-Creation-Date: 2018-03-18 14:30+0100\n" -"PO-Revision-Date: 2018-03-18 14:30+0100\n" +"POT-Creation-Date: 2018-03-25 11:40+0200\n" +"PO-Revision-Date: 2018-03-25 11:40+0200\n" "Last-Translator: Chris Warrick \n" "Language-Team: Chris Warrick \n" "Language: en\n" diff --git a/pkgbuilder/__init__.py b/pkgbuilder/__init__.py index 7017e37..e165b87 100644 --- a/pkgbuilder/__init__.py +++ b/pkgbuilder/__init__.py @@ -1,5 +1,5 @@ # -*- encoding: utf-8 -*- -# PKGBUILDer v4.2.16 +# PKGBUILDer v4.2.17 # An AUR helper (and library) in Python 3. # Copyright © 2011-2018, Chris Warrick. # All rights reserved. @@ -45,7 +45,7 @@ __title__ = 'PKGBUILDer' -__version__ = '4.2.16' +__version__ = '4.2.17' __author__ = 'Chris Warrick' __license__ = '3-clause BSD' __docformat__ = 'restructuredtext en' diff --git a/pkgbuilder/__main__.py b/pkgbuilder/__main__.py index 354a89d..936c877 100644 --- a/pkgbuilder/__main__.py +++ b/pkgbuilder/__main__.py @@ -1,5 +1,5 @@ # -*- encoding: utf-8 -*- -# PKGBUILDer v4.2.16 +# PKGBUILDer v4.2.17 # An AUR helper (and library) in Python 3. # Copyright © 2011-2018, Chris Warrick. # See /LICENSE for licensing information. @@ -52,7 +52,7 @@ def main(source='AUTO', quit=True): '-S', '--sync', action='store_true', dest='pac', help=_('build in /tmp')) argopr.add_argument( - '-F', '--fetch', action='store_true', dest='fetch', + '-F', '--fetch', '-G', '--get', action='store_true', dest='fetch', help=_('fetch package files')) argopr.add_argument( '--userfetch', action='append', dest='userfetch', diff --git a/pkgbuilder/aur.py b/pkgbuilder/aur.py index 33ce012..b57f4e4 100644 --- a/pkgbuilder/aur.py +++ b/pkgbuilder/aur.py @@ -1,5 +1,5 @@ # -*- encoding: utf-8 -*- -# PKGBUILDer v4.2.16 +# PKGBUILDer v4.2.17 # An AUR helper (and library) in Python 3. # Copyright © 2011-2018, Chris Warrick. # See /LICENSE for licensing information. diff --git a/pkgbuilder/build.py b/pkgbuilder/build.py index e96ad5c..a013423 100644 --- a/pkgbuilder/build.py +++ b/pkgbuilder/build.py @@ -1,5 +1,5 @@ # -*- encoding: utf-8 -*- -# PKGBUILDer v4.2.16 +# PKGBUILDer v4.2.17 # An AUR helper (and library) in Python 3. # Copyright © 2011-2018, Chris Warrick. # See /LICENSE for licensing information. diff --git a/pkgbuilder/exceptions.py b/pkgbuilder/exceptions.py index 93ef730..2b6f4e6 100644 --- a/pkgbuilder/exceptions.py +++ b/pkgbuilder/exceptions.py @@ -1,5 +1,5 @@ # -*- encoding: utf-8 -*- -# PKGBUILDer v4.2.16 +# PKGBUILDer v4.2.17 # An AUR helper (and library) in Python 3. # Copyright © 2011-2018, Chris Warrick. # See /LICENSE for licensing information. diff --git a/pkgbuilder/package.py b/pkgbuilder/package.py index 3e6dd84..540b154 100644 --- a/pkgbuilder/package.py +++ b/pkgbuilder/package.py @@ -1,5 +1,5 @@ # -*- encoding: utf-8 -*- -# PKGBUILDer v4.2.16 +# PKGBUILDer v4.2.17 # An AUR helper (and library) in Python 3. # Copyright © 2011-2018, Chris Warrick. # See /LICENSE for licensing information. diff --git a/pkgbuilder/pbds.py b/pkgbuilder/pbds.py index 6f28bfd..e563d0f 100644 --- a/pkgbuilder/pbds.py +++ b/pkgbuilder/pbds.py @@ -1,5 +1,5 @@ # -*- encoding: utf-8 -*- -# PKGBUILDer v4.2.16 +# PKGBUILDer v4.2.17 # An AUR helper (and library) in Python 3. # Copyright © 2011-2018, Chris Warrick. # See /LICENSE for licensing information. diff --git a/pkgbuilder/transaction.py b/pkgbuilder/transaction.py index 893ec2e..6a1eaf0 100644 --- a/pkgbuilder/transaction.py +++ b/pkgbuilder/transaction.py @@ -1,5 +1,5 @@ # -*- encoding: utf-8 -*- -# PKGBUILDer v4.2.16 +# PKGBUILDer v4.2.17 # An AUR helper (and library) in Python 3. # Copyright © 2011-2018, Chris Warrick. # See /LICENSE for licensing information. diff --git a/pkgbuilder/ui.py b/pkgbuilder/ui.py index 8650fa1..9569fb4 100644 --- a/pkgbuilder/ui.py +++ b/pkgbuilder/ui.py @@ -1,5 +1,5 @@ # -*- encoding: utf-8 -*- -# PKGBUILDer v4.2.16 +# PKGBUILDer v4.2.17 # An AUR helper (and library) in Python 3. # Copyright © 2011-2018, Chris Warrick. # See /LICENSE for licensing information. diff --git a/pkgbuilder/upgrade.py b/pkgbuilder/upgrade.py index cada249..883b09b 100644 --- a/pkgbuilder/upgrade.py +++ b/pkgbuilder/upgrade.py @@ -1,5 +1,5 @@ # -*- encoding: utf-8 -*- -# PKGBUILDer v4.2.16 +# PKGBUILDer v4.2.17 # An AUR helper (and library) in Python 3. # Copyright © 2011-2018, Chris Warrick. # See /LICENSE for licensing information. diff --git a/pkgbuilder/utils.py b/pkgbuilder/utils.py index 91620b7..ae83f3c 100644 --- a/pkgbuilder/utils.py +++ b/pkgbuilder/utils.py @@ -1,5 +1,5 @@ # -*- encoding: utf-8 -*- -# PKGBUILDer v4.2.16 +# PKGBUILDer v4.2.17 # An AUR helper (and library) in Python 3. # Copyright © 2011-2018, Chris Warrick. # See /LICENSE for licensing information. diff --git a/pkgbuilder/wrapper.py b/pkgbuilder/wrapper.py index f74eec7..095b705 100644 --- a/pkgbuilder/wrapper.py +++ b/pkgbuilder/wrapper.py @@ -1,6 +1,6 @@ # -*- encoding: utf-8 -*- # PBWrapper v0.5.0 -# PKGBUILDer v4.2.16 +# PKGBUILDer v4.2.17 # An AUR helper (and library) in Python 3. # Copyright © 2011-2018, Chris Warrick. # See /LICENSE for licensing information. @@ -25,7 +25,7 @@ import os __all__ = ('main', 'wrapper') -__wrapperversion__ = '0.5.4' +__wrapperversion__ = '0.5.5' def main(): @@ -113,14 +113,14 @@ def wrapper(source='AUTO'): pacmanlong = ['asdeps', 'asexplicit', 'dbonly', 'downloadonly', 'force', 'groups', 'list', 'needed', 'nodeps', 'noprogressbar', 'noscriptlet', 'print', 'quiet', - 'verbose'] + 'verbose', 'files'] pacmanshorta = ['b', 'r'] pacmanlonga = ['arch', 'cachedir', 'config', 'dbpath', 'gpgdir', 'hookdir', 'ignoregroup', 'logfile', 'print-format', 'root', 'assume-installed'] - pbshort = ['D', 'C', 'F'] - pblong = ['fetch', 'userfetch', 'vcsupgrade', 'novcsupgrade', 'colors', + pbshort = ['D', 'C', 'G'] + pblong = ['fetch', 'get', 'userfetch', 'vcsupgrade', 'novcsupgrade', 'colors', 'nocolors', 'depcheck', 'nodepcheck', 'validation', 'novalidation', 'install', 'buildonly', 'pgpcheck', 'skippgpcheck', 'deep', 'shallow', 'noclean', 'nodebug'] @@ -318,12 +318,12 @@ def wrapper(source='AUTO'): sanityargs = [item for item in pkgnames if (item not in sanitycheck)] DS.sudo([DS.paccommand] + pacargs + sanityargs) - elif (('-F' in argst) or ('--fetch' in argst) or - ('--userfetch' in argst) or - ('-X' in argst) or ('--runtx' in argst) or - (re.search('-[a-zA-Z]*F', ' '.join(argst)) is not None) or + elif (('-G' in argst) or ('--get' in argst) or ('--fetch' in argst) or + ('--userfetch' in argst) or ('-X' in argst) or ('--runtx' in argst) or + (re.search('-[a-zA-Z]*G', ' '.join(argst)) is not None) or (re.search('-[a-zA-Z]*X', ' '.join(argst)) is not None)): - # pkgbuilder -F, --fetch / --userfetch / -X, --runtx. + # pkgbuilder -G, --get, --fetch / --userfetch / -X, --runtx. + log.info("Running pkgbuilder command") pbmain(argst) elif ('-h' in argst) or ('--help' in argst): show_help() @@ -337,7 +337,11 @@ def wrapper(source='AUTO'): print('Please don’t use the reserved UTshibboleet argument.') elif (('-Q' in argst) or ('--query' in argst) or (re.search( - '-[a-zA-Z]*Q', ''.join(argst)) is not None)): + '-[a-zA-Z]*Q', ''.join(argst)) is not None) or + ('-F' in argst) or ('--files' in argst) or (re.search( + '-[a-zA-Z]*F', ''.join(argst)) is not None)): + log.info("Running rootless pacman command") DS.run_command([DS.paccommand] + argst) else: + log.info("Running root pacman command") DS.sudo([DS.paccommand] + argst) diff --git a/setup.py b/setup.py index a36130d..cc690a2 100755 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ def run_tests(self): sys.exit(errno) setup(name='pkgbuilder', - version='4.2.16', + version='4.2.17', description='An AUR helper (and library) in Python 3.', keywords='arch pkgbuild', author='Chris Warrick',