diff --git a/.pbwrapperhelp b/.pbwrapperhelp index 5c4328b..d8e13ab 100644 --- a/.pbwrapperhelp +++ b/.pbwrapperhelp @@ -51,7 +51,7 @@ usage: pkgbuilder [-h] [-V] [-S] [-F] [--userfetch USER] [-i] [-s] [-u] [-U] An AUR helper (and library) in Python 3. positional arguments: - PACKAGE AUR/ABS packages to build + PACKAGE AUR/repository packages to build optional arguments: -h, --help show this help message and exit @@ -97,4 +97,4 @@ configuration overrides: --notmp don't build in /tmp --build build (instead of fetching) -Also accepts ABS packages. +Also accepts repository packages to build from source. diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 431b5ee..cb19512 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,8 +5,8 @@ Appendix C. Changelog :Author: Chris Warrick :Copyright: © 2011-2017, Chris Warrick. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2017-05-02 -:Version: 4.2.11 +:Date: 2017-05-13 +:Version: 4.2.12 .. index:: CHANGELOG @@ -47,6 +47,11 @@ More information can be found on GitHub in the `releases section pkgname=pkgbuilder _pyname=pkgbuilder -pkgver=4.2.11 +pkgver=4.2.12 pkgrel=1 pkgdesc='A Python AUR helper/library.' arch=('any') url='https://github.com/Kwpolska/pkgbuilder' license=('BSD') -depends=('python' 'python-setuptools' 'pyalpm>=0.5.1-1' 'python-requests' 'python-srcinfo' 'rsync' 'git') +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=('bd8b0ca1b89cd8b1331f39694c864d55') +md5sums=('5a6a74db9dd09fe79d3735fec1e4769f') package() { cd "${srcdir}/${_pyname}-${pkgver}" diff --git a/PKGBUILD-git b/PKGBUILD-git index 274eaff..df8ef30 100644 --- a/PKGBUILD-git +++ b/PKGBUILD-git @@ -2,13 +2,13 @@ pkgname=pkgbuilder-git _pyname=pkgbuilder _gitname=pkgbuilder -pkgver=4.2.11 +pkgver=4.2.12 pkgrel=1 pkgdesc='A Python AUR helper/library. (git version)' arch=('any') url='https://github.com/Kwpolska/pkgbuilder' license=('BSD') -depends=('python' 'python-setuptools' 'pyalpm>=0.5.1-1' 'python-requests' 'python-srcinfo' 'rsync' 'git') +depends=('python' 'python-setuptools' 'pyalpm>=0.5.1-1' 'python-requests' 'python-srcinfo' 'asp' 'git') makedepends=('git') options=(!emptydirs) provides=('pkgbuilder') diff --git a/README b/README index e5873ac..3502a07 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: 2017-05-02 -:Version: 4.2.11 +:Date: 2017-05-13 +:Version: 4.2.12 .. index: README diff --git a/README.rst b/README.rst index e5873ac..3502a07 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: 2017-05-02 -:Version: 4.2.11 +:Date: 2017-05-13 +:Version: 4.2.12 .. index: README diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 431b5ee..cb19512 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -5,8 +5,8 @@ Appendix C. Changelog :Author: Chris Warrick :Copyright: © 2011-2017, Chris Warrick. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2017-05-02 -:Version: 4.2.11 +:Date: 2017-05-13 +:Version: 4.2.12 .. index:: CHANGELOG @@ -47,6 +47,11 @@ More information can be found on GitHub in the `releases section -:Date: 2017-05-02 -:Version: 4.2.11 +:Date: 2017-05-13 +:Version: 4.2.12 .. index:: LICENSE diff --git a/docs/README.rst b/docs/README.rst index e5873ac..3502a07 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: 2017-05-02 -:Version: 4.2.11 +:Date: 2017-05-13 +:Version: 4.2.12 .. index: README diff --git a/docs/aur.rst b/docs/aur.rst index 4101f4b..765e8f9 100644 --- a/docs/aur.rst +++ b/docs/aur.rst @@ -4,8 +4,8 @@ aur module (AUR class) :Author: Chris Warrick :Copyright: © 2011-2017, Chris Warrick. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2017-05-02 -:Version: 4.2.11 +:Date: 2017-05-13 +:Version: 4.2.12 .. index:: AUR; RPC .. index:: RPC diff --git a/docs/build.rst b/docs/build.rst index 8123906..015f577 100644 --- a/docs/build.rst +++ b/docs/build.rst @@ -5,8 +5,8 @@ build module :Author: Chris Warrick :Copyright: © 2011-2017, Chris Warrick. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2017-05-02 -:Version: 4.2.11 +:Date: 2017-05-13 +:Version: 4.2.12 .. index:: build .. versionadded:: 2.1.0.0 diff --git a/docs/conf.py b/docs/conf.py index 452bcb1..bb749db 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -48,9 +48,9 @@ # built documents. # # The short X.Y version. -version = '4.2.11' +version = '4.2.12' # The full version, including alpha/beta/rc tags. -release = '4.2.11' +release = '4.2.12' # 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 7fcfe6e..da8b567 100644 --- a/docs/exceptions.rst +++ b/docs/exceptions.rst @@ -5,8 +5,8 @@ Exceptions in PKGBUILDer :Author: Chris Warrick :Copyright: © 2011-2017, Chris Warrick. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2017-05-02 -:Version: 4.2.11 +:Date: 2017-05-13 +:Version: 4.2.12 .. index:: Exceptions .. versionadded:: 3.0.0 diff --git a/docs/main.rst b/docs/main.rst index 2d84e3b..ff48d6f 100644 --- a/docs/main.rst +++ b/docs/main.rst @@ -4,8 +4,8 @@ __main__ module :Author: Chris Warrick :Copyright: © 2011-2017, Chris Warrick. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2017-05-02 -:Version: 4.2.11 +:Date: 2017-05-13 +:Version: 4.2.12 .. index:: main .. versionchanged:: 4.0.0 diff --git a/docs/package.rst b/docs/package.rst index e341604..d7f81e4 100644 --- a/docs/package.rst +++ b/docs/package.rst @@ -5,8 +5,8 @@ package module (Package, AURPackage, ABSPackage classes) :Author: Chris Warrick :Copyright: © 2011-2017, Chris Warrick. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2017-05-02 -:Version: 4.2.11 +:Date: 2017-05-13 +:Version: 4.2.12 .. index:: Package .. index:: AURPackage @@ -17,6 +17,8 @@ Added in 3.0.0, the Package family of classes is the core of PKGBUILDer. They are responsible for storing package data in a consistent way. All class entries are Pythonic. +**Historic note:** whenever *ABS* is used, it means *repository package*. The ABS tool was deprecated in 2017 and replaced by ASP; however, PKGBUILDer uses that abbreviation to refer to packages that are in Arch repositories. + .. automodule:: pkgbuilder.package .. autoclass:: pkgbuilder.package.Package @@ -36,13 +38,13 @@ attributes: +-------------------+--------+---------+---------------------------------------------------------------------------------------------+ | description | str | None | Package description. | +-------------------+--------+---------+---------------------------------------------------------------------------------------------+ -| repo | str | None | The repo (ABS) or category (AUR) of the package in question. | +| repo | str | None | The repo or category (AUR) of the package in question. | +-------------------+--------+---------+---------------------------------------------------------------------------------------------+ | url | str | None | The upstream URL specified in the PKGBUILD. | +-------------------+--------+---------+---------------------------------------------------------------------------------------------+ | licenses | list | [] | Licenses specified in the PKGBUILD. | +-------------------+--------+---------+---------------------------------------------------------------------------------------------+ -| human | str | None | The packager (ABS) or maintainer (AUR) of the package in question. | +| human | str | None | The packager (repo) or maintainer (AUR) of the package in question. | +-------------------+--------+---------+---------------------------------------------------------------------------------------------+ .. autoclass:: pkgbuilder.package.AURPackage diff --git a/docs/pb.8.gz b/docs/pb.8.gz index 49ebfd0..3a49a32 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 5f3b5a8..a1c5b69 100644 --- a/docs/pb.rst +++ b/docs/pb.rst @@ -6,8 +6,8 @@ PBWrapper :Author: Chris Warrick :Copyright: © 2011-2017, Chris Warrick. :License: BSD (see /LICENSE or Appendix B.) -:Date: 2017-05-02 -:Version: 4.2.11 +:Date: 2017-05-13 +:Version: 4.2.12 :Wrapper Version: 0.5.3 :Manual section: 8 :Manual group: PKGBUILDer manual @@ -59,7 +59,7 @@ pb -S python hello Installs the Python interpreter from the repos (which is already on your system, especially if you have installed PKGBUILDer/PBWrapper) and GNU Hello from the AUR. Note that, if you used ``pkgbuilder`` instead - of ``pb``, the Python package would be fetched from the ABS (instead of the + of ``pb``, the Python package would be fetched from ASP (instead of the repositories) and built locally. pb -Si python hello diff --git a/docs/pbds.rst b/docs/pbds.rst index 4f47c95..7587654 100644 --- a/docs/pbds.rst +++ b/docs/pbds.rst @@ -5,8 +5,8 @@ pbds module (PBDS class) :Author: Chris Warrick :Copyright: © 2011-2017, Chris Warrick. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2017-05-02 -:Version: 4.2.11 +:Date: 2017-05-13 +:Version: 4.2.12 .. module: pbds diff --git a/docs/pkgbuilder.8.gz b/docs/pkgbuilder.8.gz index ba412e5..b505539 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 7ad0d6c..0b3ef93 100644 --- a/docs/pkgbuilder.rst +++ b/docs/pkgbuilder.rst @@ -6,8 +6,8 @@ PKGBUILDer :Author: Chris Warrick :Copyright: © 2011-2017, Chris Warrick. :License: BSD (see /LICENSE or Appendix B.) -:Date: 2017-05-02 -:Version: 4.2.11 +:Date: 2017-05-13 +:Version: 4.2.12 :Manual section: 8 :Manual group: PKGBUILDer manual @@ -27,9 +27,9 @@ much as possible. Since version 2.1.0.0, PKGBUILDer provides modules that can be used in other scripts. -Since version 2.1.5.6, PKGBUILDer also provides support for ABS packages. -Passing an ABS package name to the ``-S`` option will result in a seamless -detection and build process. +Since version 2.1.5.6, PKGBUILDer also provides support for repository +packages. Passing a repository package name to the ``-S`` option will result +in a seamless detection and build process. Notice: Running PKGBUILDer and/or PBWrapper as root can deal catastrophic damage to your system. Run it as a regular user, you will be prompted for @@ -149,8 +149,8 @@ pkgbuilder -SF hello Like above, but does it in /tmp/pkgbuilder-UID. pkgbuilder python - Python is a binary repo package, triggering a ABS download via rsync (no - need for ``extra/abs``). -S and/or -F are also accepted. + Python is a binary repo package, triggering a package download from ASP. + -S and/or -F 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 6cb2be7..daac00c 100644 --- a/docs/sample-scripts.rst +++ b/docs/sample-scripts.rst @@ -4,8 +4,8 @@ PKGBUILDer Sample Scripts :Author: Chris Warrick :Copyright: © 2011-2017, Chris Warrick. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2017-05-02 -:Version: 4.2.11 +:Date: 2017-05-13 +:Version: 4.2.12 .. index:: sample scripts diff --git a/docs/transaction.rst b/docs/transaction.rst index a315d39..cf8cd6f 100644 --- a/docs/transaction.rst +++ b/docs/transaction.rst @@ -5,8 +5,8 @@ Transactions :Author: Chris Warrick :Copyright: © 2011-2017, Chris Warrick. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2017-05-02 -:Version: 4.2.11 +:Date: 2017-05-13 +:Version: 4.2.12 .. index:: transaction .. versionadded:: 4.1.0 diff --git a/docs/ui.rst b/docs/ui.rst index 048939a..e2f8478 100644 --- a/docs/ui.rst +++ b/docs/ui.rst @@ -5,8 +5,8 @@ ui module (UI class) :Author: Chris Warrick :Copyright: © 2011-2017, Chris Warrick. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2017-05-02 -:Version: 4.2.11 +:Date: 2017-05-13 +:Version: 4.2.12 .. index:: UI .. versionadded:: 3.0.0 diff --git a/docs/upgrade.rst b/docs/upgrade.rst index 2700c58..67e4efa 100644 --- a/docs/upgrade.rst +++ b/docs/upgrade.rst @@ -5,8 +5,8 @@ upgrade module :Author: Chris Warrick :Copyright: © 2011-2017, Chris Warrick. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2017-05-02 -:Version: 4.2.11 +:Date: 2017-05-13 +:Version: 4.2.12 .. index:: upgrade .. index:: Syu diff --git a/docs/utils.rst b/docs/utils.rst index 2648b5d..0c472f9 100644 --- a/docs/utils.rst +++ b/docs/utils.rst @@ -5,8 +5,8 @@ utils module :Author: Chris Warrick :Copyright: © 2011-2017, Chris Warrick. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2017-05-02 -:Version: 4.2.11 +:Date: 2017-05-13 +:Version: 4.2.12 .. index:: utils .. versionadded:: 2.1.0.0 diff --git a/docs/wrapper.rst b/docs/wrapper.rst index 89ba375..14de63b 100644 --- a/docs/wrapper.rst +++ b/docs/wrapper.rst @@ -4,8 +4,8 @@ PBWrapper :Author: Chris Warrick :Copyright: © 2011-2017, Chris Warrick. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2017-05-02 -:Version: 4.2.11 +:Date: 2017-05-13 +:Version: 4.2.12 :PBWrapper Version: 0.2.3 .. index:: wrapper diff --git a/locale/ar/LC_MESSAGES/pkgbuilder.mo b/locale/ar/LC_MESSAGES/pkgbuilder.mo index e25fb94..ddca703 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 d70ccd9..7a4bc53 100644 --- 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.11\n" +"Project-Id-Version: 4.2.12\n" "Report-Msgid-Bugs-To: Chris Warrick \n" -"POT-Creation-Date: 2017-05-02 14:42+0200\n" +"POT-Creation-Date: 2017-05-13 15:31+0200\n" "PO-Revision-Date: 2015-09-08 15:37+0000\n" "Last-Translator: Chris Warrick \n" "Language-Team: Arabic (http://www.transifex.com/kwpolska/pkgbuilder/language/" @@ -54,7 +54,7 @@ msgid "Fetching package information..." msgstr "" #: pkgbuilder/build.py:390 -msgid ":: Retrieving packages from abs..." +msgid ":: Retrieving packages from asp..." msgstr "" #: pkgbuilder/build.py:393 @@ -64,7 +64,7 @@ msgstr "" #: pkgbuilder/build.py:397 pkgbuilder/build.py:449 #, python-brace-format -msgid "Failed to retieve {0} (from ABS/rsync)." +msgid "Failed to retieve {0} (from ASP)." msgstr "" #: pkgbuilder/build.py:401 @@ -86,7 +86,7 @@ msgid "Building {0}..." msgstr "" #: pkgbuilder/build.py:445 -msgid "Retrieving from ABS..." +msgid "Retrieving from ASP..." msgstr "" #: pkgbuilder/build.py:454 pkgbuilder/build.py:478 @@ -184,7 +184,7 @@ msgid "An AUR helper (and library) in Python 3." msgstr "" #: pkgbuilder/__main__.py:42 -msgid "Also accepts ABS packages." +msgid "Also accepts repository packages to build from source." msgstr "" #: pkgbuilder/__main__.py:45 @@ -196,7 +196,7 @@ msgid "PACKAGE" msgstr "" #: pkgbuilder/__main__.py:48 -msgid "AUR/ABS packages to build" +msgid "AUR/repository packages to build" msgstr "" #: pkgbuilder/__main__.py:50 @@ -578,7 +578,7 @@ msgid "Didn’t pass any packages." msgstr "" #: pkgbuilder/utils.py:134 -msgid "Trying to use utils.print_package_info with an ABS package" +msgid "Trying to use utils.print_package_info with a repository package" msgstr "" #. TRANSLATORS: space it properly. “yes/no” below are diff --git a/locale/cs/LC_MESSAGES/pkgbuilder.mo b/locale/cs/LC_MESSAGES/pkgbuilder.mo index 40ec0d1..77bde45 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 1b1b868..0048606 100644 --- a/locale/cs/LC_MESSAGES/pkgbuilder.po +++ b/locale/cs/LC_MESSAGES/pkgbuilder.po @@ -6,9 +6,9 @@ # Martin Kříž , 2016 msgid "" msgstr "" -"Project-Id-Version: 4.2.11\n" +"Project-Id-Version: 4.2.12\n" "Report-Msgid-Bugs-To: Chris Warrick \n" -"POT-Creation-Date: 2017-05-02 14:42+0200\n" +"POT-Creation-Date: 2017-05-13 15:31+0200\n" "PO-Revision-Date: 2016-04-08 19:32+0000\n" "Last-Translator: Martin Kříž \n" "Language-Team: Czech (http://www.transifex.com/kwpolska/pkgbuilder/language/" @@ -54,7 +54,8 @@ msgid "Fetching package information..." msgstr "Načítání informací o balíku..." #: pkgbuilder/build.py:390 -msgid ":: Retrieving packages from abs..." +#, fuzzy +msgid ":: Retrieving packages from asp..." msgstr ":: Získávání balíčků z abs..." #: pkgbuilder/build.py:393 @@ -63,8 +64,8 @@ msgid "retrieving {0}" msgstr "načítání {0}" #: pkgbuilder/build.py:397 pkgbuilder/build.py:449 -#, python-brace-format -msgid "Failed to retieve {0} (from ABS/rsync)." +#, fuzzy, python-brace-format +msgid "Failed to retieve {0} (from ASP)." msgstr "Nepodařilo se získat {0} (z ABS/rsync)." #: pkgbuilder/build.py:401 @@ -86,7 +87,8 @@ msgid "Building {0}..." msgstr "Budování {0}..." #: pkgbuilder/build.py:445 -msgid "Retrieving from ABS..." +#, fuzzy +msgid "Retrieving from ASP..." msgstr "Načítání z ABS..." #: pkgbuilder/build.py:454 pkgbuilder/build.py:478 @@ -184,8 +186,8 @@ msgid "An AUR helper (and library) in Python 3." msgstr "AUR pomocník (a knihovna) v Pythonu 3." #: pkgbuilder/__main__.py:42 -msgid "Also accepts ABS packages." -msgstr "Přijímá také ABS balíčky." +msgid "Also accepts repository packages to build from source." +msgstr "" #: pkgbuilder/__main__.py:45 msgid "show version number and quit" @@ -196,7 +198,8 @@ msgid "PACKAGE" msgstr "BALÍČEK" #: pkgbuilder/__main__.py:48 -msgid "AUR/ABS packages to build" +#, fuzzy +msgid "AUR/repository packages to build" msgstr "AUR/ABS balíky k sestavení" #: pkgbuilder/__main__.py:50 @@ -582,7 +585,8 @@ msgid "Didn’t pass any packages." msgstr "Některé balíky neprošly." #: pkgbuilder/utils.py:134 -msgid "Trying to use utils.print_package_info with an ABS package" +#, fuzzy +msgid "Trying to use utils.print_package_info with a repository package" msgstr "Pokus o použití utils.print_package_info s balíčkem ABS" #. TRANSLATORS: space it properly. “yes/no” below are @@ -660,3 +664,6 @@ msgstr "volitelné argumenty" #: localeprovider.py:5 msgid "show this help message and exit" msgstr "zobrazit tuto nápovědu a ukončit" + +#~ msgid "Also accepts ABS packages." +#~ msgstr "Přijímá také ABS balíčky." diff --git a/locale/de/LC_MESSAGES/pkgbuilder.mo b/locale/de/LC_MESSAGES/pkgbuilder.mo index 9bd4a8d..c97b780 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 719a242..815d3f1 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.11\n" +"Project-Id-Version: 4.2.12\n" "Report-Msgid-Bugs-To: Chris Warrick \n" -"POT-Creation-Date: 2017-05-02 14:42+0200\n" +"POT-Creation-Date: 2017-05-13 15:31+0200\n" "PO-Revision-Date: 2015-09-08 15:37+0000\n" "Last-Translator: Chris Warrick \n" "Language-Team: German (http://www.transifex.com/kwpolska/pkgbuilder/language/" @@ -54,8 +54,9 @@ msgid "Fetching package information..." msgstr "Sammle Paket informationen..." #: pkgbuilder/build.py:390 -msgid ":: Retrieving packages from abs..." -msgstr "" +#, fuzzy +msgid ":: Retrieving packages from asp..." +msgstr "::Erhalte Pakete aus den AUR..." #: pkgbuilder/build.py:393 #, python-brace-format @@ -64,7 +65,7 @@ msgstr "" #: pkgbuilder/build.py:397 pkgbuilder/build.py:449 #, python-brace-format -msgid "Failed to retieve {0} (from ABS/rsync)." +msgid "Failed to retieve {0} (from ASP)." msgstr "" #: pkgbuilder/build.py:401 @@ -86,8 +87,9 @@ msgid "Building {0}..." msgstr "Bilde{0}..." #: pkgbuilder/build.py:445 -msgid "Retrieving from ABS..." -msgstr "" +#, fuzzy +msgid "Retrieving from ASP..." +msgstr "::Erhalte Pakete aus den AUR..." #: pkgbuilder/build.py:454 pkgbuilder/build.py:478 #, python-brace-format @@ -184,7 +186,7 @@ msgid "An AUR helper (and library) in Python 3." msgstr "" #: pkgbuilder/__main__.py:42 -msgid "Also accepts ABS packages." +msgid "Also accepts repository packages to build from source." msgstr "" #: pkgbuilder/__main__.py:45 @@ -196,7 +198,7 @@ msgid "PACKAGE" msgstr "PACKAGE" #: pkgbuilder/__main__.py:48 -msgid "AUR/ABS packages to build" +msgid "AUR/repository packages to build" msgstr "" #: pkgbuilder/__main__.py:50 @@ -578,7 +580,7 @@ msgid "Didn’t pass any packages." msgstr "" #: pkgbuilder/utils.py:134 -msgid "Trying to use utils.print_package_info with an ABS package" +msgid "Trying to use utils.print_package_info with a repository package" msgstr "" #. TRANSLATORS: space it properly. “yes/no” below are diff --git a/locale/es/LC_MESSAGES/pkgbuilder.mo b/locale/es/LC_MESSAGES/pkgbuilder.mo index 1ab6ae7..c3c6ee7 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 40a7d01..6a7188e 100644 --- a/locale/es/LC_MESSAGES/pkgbuilder.po +++ b/locale/es/LC_MESSAGES/pkgbuilder.po @@ -13,9 +13,9 @@ # tufadorin , 2013 msgid "" msgstr "" -"Project-Id-Version: 4.2.11\n" +"Project-Id-Version: 4.2.12\n" "Report-Msgid-Bugs-To: Chris Warrick \n" -"POT-Creation-Date: 2017-05-02 14:42+0200\n" +"POT-Creation-Date: 2017-05-13 15:31+0200\n" "PO-Revision-Date: 2015-09-08 15:38+0000\n" "Last-Translator: Chris Warrick \n" "Language-Team: Spanish (http://www.transifex.com/kwpolska/pkgbuilder/" @@ -61,7 +61,8 @@ msgid "Fetching package information..." msgstr "Obteniendo información de los paquetes ..." #: pkgbuilder/build.py:390 -msgid ":: Retrieving packages from abs..." +#, fuzzy +msgid ":: Retrieving packages from asp..." msgstr ":: Recuperando paquetes de abs ..." #: pkgbuilder/build.py:393 @@ -70,8 +71,8 @@ msgid "retrieving {0}" msgstr "recuperando {0}" #: pkgbuilder/build.py:397 pkgbuilder/build.py:449 -#, python-brace-format -msgid "Failed to retieve {0} (from ABS/rsync)." +#, fuzzy, python-brace-format +msgid "Failed to retieve {0} (from ASP)." msgstr "No se ha podido recuperar {0} (de ABS/rsync)." #: pkgbuilder/build.py:401 @@ -93,7 +94,8 @@ msgid "Building {0}..." msgstr "Construyendo {0}..." #: pkgbuilder/build.py:445 -msgid "Retrieving from ABS..." +#, fuzzy +msgid "Retrieving from ASP..." msgstr "Recuperando de ABS ..." #: pkgbuilder/build.py:454 pkgbuilder/build.py:478 @@ -191,7 +193,7 @@ msgid "An AUR helper (and library) in Python 3." msgstr "Un ayudante de AUR (y librerías) en Python 3." #: pkgbuilder/__main__.py:42 -msgid "Also accepts ABS packages." +msgid "Also accepts repository packages to build from source." msgstr "" #: pkgbuilder/__main__.py:45 @@ -203,7 +205,8 @@ msgid "PACKAGE" msgstr "PAQUETE" #: pkgbuilder/__main__.py:48 -msgid "AUR/ABS packages to build" +#, fuzzy +msgid "AUR/repository packages to build" msgstr "paquetes AUR/ABS para construir" #: pkgbuilder/__main__.py:50 @@ -587,7 +590,8 @@ msgid "Didn’t pass any packages." msgstr "No pasó ningún paquete." #: pkgbuilder/utils.py:134 -msgid "Trying to use utils.print_package_info with an ABS package" +#, fuzzy +msgid "Trying to use utils.print_package_info with a repository package" msgstr "Tratando de utilizar utils.print_package_info con un paquete de ABS" #. TRANSLATORS: space it properly. “yes/no” below are diff --git a/locale/id/LC_MESSAGES/pkgbuilder.mo b/locale/id/LC_MESSAGES/pkgbuilder.mo index 4041a09..2e441d6 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 ee35e19..f542573 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.11\n" +"Project-Id-Version: 4.2.12\n" "Report-Msgid-Bugs-To: Chris Warrick \n" -"POT-Creation-Date: 2017-05-02 14:42+0200\n" +"POT-Creation-Date: 2017-05-13 15:31+0200\n" "PO-Revision-Date: 2015-09-08 15:37+0000\n" "Last-Translator: Chris Warrick \n" "Language-Team: Indonesian (http://www.transifex.com/kwpolska/pkgbuilder/" @@ -53,7 +53,7 @@ msgid "Fetching package information..." msgstr "" #: pkgbuilder/build.py:390 -msgid ":: Retrieving packages from abs..." +msgid ":: Retrieving packages from asp..." msgstr "" #: pkgbuilder/build.py:393 @@ -63,7 +63,7 @@ msgstr "" #: pkgbuilder/build.py:397 pkgbuilder/build.py:449 #, python-brace-format -msgid "Failed to retieve {0} (from ABS/rsync)." +msgid "Failed to retieve {0} (from ASP)." msgstr "" #: pkgbuilder/build.py:401 @@ -85,7 +85,7 @@ msgid "Building {0}..." msgstr "" #: pkgbuilder/build.py:445 -msgid "Retrieving from ABS..." +msgid "Retrieving from ASP..." msgstr "" #: pkgbuilder/build.py:454 pkgbuilder/build.py:478 @@ -183,7 +183,7 @@ msgid "An AUR helper (and library) in Python 3." msgstr "" #: pkgbuilder/__main__.py:42 -msgid "Also accepts ABS packages." +msgid "Also accepts repository packages to build from source." msgstr "" #: pkgbuilder/__main__.py:45 @@ -195,7 +195,7 @@ msgid "PACKAGE" msgstr "" #: pkgbuilder/__main__.py:48 -msgid "AUR/ABS packages to build" +msgid "AUR/repository packages to build" msgstr "" #: pkgbuilder/__main__.py:50 @@ -577,7 +577,7 @@ msgid "Didn’t pass any packages." msgstr "" #: pkgbuilder/utils.py:134 -msgid "Trying to use utils.print_package_info with an ABS package" +msgid "Trying to use utils.print_package_info with a repository package" msgstr "" #. TRANSLATORS: space it properly. “yes/no” below are diff --git a/locale/it/LC_MESSAGES/pkgbuilder.mo b/locale/it/LC_MESSAGES/pkgbuilder.mo index cd8add0..991488b 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 321f29e..a55556c 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.11\n" +"Project-Id-Version: 4.2.12\n" "Report-Msgid-Bugs-To: Chris Warrick \n" -"POT-Creation-Date: 2017-05-02 14:42+0200\n" +"POT-Creation-Date: 2017-05-13 15:31+0200\n" "PO-Revision-Date: 2015-09-08 15:38+0000\n" "Last-Translator: Chris Warrick \n" "Language-Team: Italian (http://www.transifex.com/kwpolska/pkgbuilder/" @@ -58,7 +58,8 @@ msgid "Fetching package information..." msgstr "Recupero informazioni del pacchetto..." #: pkgbuilder/build.py:390 -msgid ":: Retrieving packages from abs..." +#, fuzzy +msgid ":: Retrieving packages from asp..." msgstr ":: Recùpero dei pacchetti da abs..." #: pkgbuilder/build.py:393 @@ -67,8 +68,8 @@ msgid "retrieving {0}" msgstr "recupero {0}" #: pkgbuilder/build.py:397 pkgbuilder/build.py:449 -#, python-brace-format -msgid "Failed to retieve {0} (from ABS/rsync)." +#, fuzzy, python-brace-format +msgid "Failed to retieve {0} (from ASP)." msgstr "Impossibile recuperare {0} (da ABS/rsync)." #: pkgbuilder/build.py:401 @@ -90,7 +91,8 @@ msgid "Building {0}..." msgstr "Costruzione {0}..." #: pkgbuilder/build.py:445 -msgid "Retrieving from ABS..." +#, fuzzy +msgid "Retrieving from ASP..." msgstr "Recupero da ABS..." #: pkgbuilder/build.py:454 pkgbuilder/build.py:478 @@ -188,7 +190,7 @@ msgid "An AUR helper (and library) in Python 3." msgstr "Un assistente di AUR (e libreria) in Python 3." #: pkgbuilder/__main__.py:42 -msgid "Also accepts ABS packages." +msgid "Also accepts repository packages to build from source." msgstr "" #: pkgbuilder/__main__.py:45 @@ -200,7 +202,8 @@ msgid "PACKAGE" msgstr "PACCHETTO" #: pkgbuilder/__main__.py:48 -msgid "AUR/ABS packages to build" +#, fuzzy +msgid "AUR/repository packages to build" msgstr "Pacchetti da costruire AUR/ABS" #: pkgbuilder/__main__.py:50 @@ -588,7 +591,8 @@ msgid "Didn’t pass any packages." msgstr "Non ha superato tutti i pacchetti." #: pkgbuilder/utils.py:134 -msgid "Trying to use utils.print_package_info with an ABS package" +#, fuzzy +msgid "Trying to use utils.print_package_info with a repository package" msgstr "Tentativo di utilizzare utils.print_package_info con un pacchetto ABS" #. TRANSLATORS: space it properly. “yes/no” below are diff --git a/locale/ja/LC_MESSAGES/pkgbuilder.mo b/locale/ja/LC_MESSAGES/pkgbuilder.mo index 5b75622..512202a 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 c3fe12e..1e9cfd4 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.11\n" +"Project-Id-Version: 4.2.12\n" "Report-Msgid-Bugs-To: Chris Warrick \n" -"POT-Creation-Date: 2017-05-02 14:42+0200\n" +"POT-Creation-Date: 2017-05-13 15:31+0200\n" "PO-Revision-Date: 2015-09-08 15:37+0000\n" "Last-Translator: Chris Warrick \n" "Language-Team: Japanese (http://www.transifex.com/kwpolska/pkgbuilder/" @@ -53,7 +53,7 @@ msgid "Fetching package information..." msgstr "" #: pkgbuilder/build.py:390 -msgid ":: Retrieving packages from abs..." +msgid ":: Retrieving packages from asp..." msgstr "" #: pkgbuilder/build.py:393 @@ -63,7 +63,7 @@ msgstr "" #: pkgbuilder/build.py:397 pkgbuilder/build.py:449 #, python-brace-format -msgid "Failed to retieve {0} (from ABS/rsync)." +msgid "Failed to retieve {0} (from ASP)." msgstr "" #: pkgbuilder/build.py:401 @@ -85,7 +85,7 @@ msgid "Building {0}..." msgstr "「{0}」を作成中・・・" #: pkgbuilder/build.py:445 -msgid "Retrieving from ABS..." +msgid "Retrieving from ASP..." msgstr "" #: pkgbuilder/build.py:454 pkgbuilder/build.py:478 @@ -183,7 +183,7 @@ msgid "An AUR helper (and library) in Python 3." msgstr "Python 3で作られたAUR Helper兼ライブラリ。" #: pkgbuilder/__main__.py:42 -msgid "Also accepts ABS packages." +msgid "Also accepts repository packages to build from source." msgstr "" #: pkgbuilder/__main__.py:45 @@ -195,7 +195,8 @@ msgid "PACKAGE" msgstr "パッケージ" #: pkgbuilder/__main__.py:48 -msgid "AUR/ABS packages to build" +#, fuzzy +msgid "AUR/repository packages to build" msgstr "作成するパッケージ" #: pkgbuilder/__main__.py:50 @@ -577,7 +578,7 @@ msgid "Didn’t pass any packages." msgstr "" #: pkgbuilder/utils.py:134 -msgid "Trying to use utils.print_package_info with an ABS package" +msgid "Trying to use utils.print_package_info with a repository package" msgstr "" #. TRANSLATORS: space it properly. “yes/no” below are diff --git a/locale/pl/LC_MESSAGES/pkgbuilder.mo b/locale/pl/LC_MESSAGES/pkgbuilder.mo index 34568a3..b0c4410 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 87b5eb0..52c5da6 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.11\n" +"Project-Id-Version: 4.2.12\n" "Report-Msgid-Bugs-To: Chris Warrick \n" -"POT-Creation-Date: 2017-05-02 14:42+0200\n" +"POT-Creation-Date: 2017-05-13 15:31+0200\n" "PO-Revision-Date: 2016-04-29 14:30+0000\n" "Last-Translator: Chris Warrick \n" "Language-Team: Polish (http://www.transifex.com/kwpolska/pkgbuilder/language/" @@ -59,7 +59,8 @@ msgid "Fetching package information..." msgstr "Pobieranie informacji o pakiecie..." #: pkgbuilder/build.py:390 -msgid ":: Retrieving packages from abs..." +#, fuzzy +msgid ":: Retrieving packages from asp..." msgstr ":: Pobieranie pakietów z abs..." #: pkgbuilder/build.py:393 @@ -68,8 +69,8 @@ msgid "retrieving {0}" msgstr "pobieranie {0}" #: pkgbuilder/build.py:397 pkgbuilder/build.py:449 -#, python-brace-format -msgid "Failed to retieve {0} (from ABS/rsync)." +#, fuzzy, python-brace-format +msgid "Failed to retieve {0} (from ASP)." msgstr "Nie udało się pobrać {0} (z ABS/rsync)." #: pkgbuilder/build.py:401 @@ -91,7 +92,8 @@ msgid "Building {0}..." msgstr "Budowanie {0}..." #: pkgbuilder/build.py:445 -msgid "Retrieving from ABS..." +#, fuzzy +msgid "Retrieving from ASP..." msgstr "Pobieranie z ABS..." #: pkgbuilder/build.py:454 pkgbuilder/build.py:478 @@ -189,8 +191,8 @@ msgid "An AUR helper (and library) in Python 3." msgstr "Pomocnik AUR (i biblioteka) w Pythonie 3." #: pkgbuilder/__main__.py:42 -msgid "Also accepts ABS packages." -msgstr "Również akceptuje pakiety z ABS." +msgid "Also accepts repository packages to build from source." +msgstr "" #: pkgbuilder/__main__.py:45 msgid "show version number and quit" @@ -201,7 +203,8 @@ msgid "PACKAGE" msgstr "PAKIET" #: pkgbuilder/__main__.py:48 -msgid "AUR/ABS packages to build" +#, fuzzy +msgid "AUR/repository packages to build" msgstr "pakiety do zbudowania z AUR i ABS" #: pkgbuilder/__main__.py:50 @@ -589,7 +592,8 @@ msgid "Didn’t pass any packages." msgstr "Nie podano żadnych pakietów." #: pkgbuilder/utils.py:134 -msgid "Trying to use utils.print_package_info with an ABS package" +#, fuzzy +msgid "Trying to use utils.print_package_info with a repository package" msgstr "Próba użycia utils.print_package_info z pakietem z ABS" #. TRANSLATORS: space it properly. “yes/no” below are @@ -700,3 +704,6 @@ msgstr "argumenty opcjonalne" #: localeprovider.py:5 msgid "show this help message and exit" msgstr "pokaż tą wiadomość i wyjdź" + +#~ msgid "Also accepts ABS packages." +#~ msgstr "Również akceptuje pakiety z ABS." diff --git a/locale/pt/LC_MESSAGES/pkgbuilder.mo b/locale/pt/LC_MESSAGES/pkgbuilder.mo index e7e96b1..ed9d3b9 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 408a7fa..b79f580 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.11\n" +"Project-Id-Version: 4.2.12\n" "Report-Msgid-Bugs-To: Chris Warrick \n" -"POT-Creation-Date: 2017-05-02 14:42+0200\n" +"POT-Creation-Date: 2017-05-13 15:31+0200\n" "PO-Revision-Date: 2015-09-08 15:38+0000\n" "Last-Translator: Chris Warrick \n" "Language-Team: Portuguese (http://www.transifex.com/kwpolska/pkgbuilder/" @@ -54,7 +54,8 @@ msgid "Fetching package information..." msgstr "Obtendo informações do pacote.." #: pkgbuilder/build.py:390 -msgid ":: Retrieving packages from abs..." +#, fuzzy +msgid ":: Retrieving packages from asp..." msgstr ":: Obtendo pacotes do abs..." #: pkgbuilder/build.py:393 @@ -63,8 +64,8 @@ msgid "retrieving {0}" msgstr "recebendo {0}" #: pkgbuilder/build.py:397 pkgbuilder/build.py:449 -#, python-brace-format -msgid "Failed to retieve {0} (from ABS/rsync)." +#, fuzzy, python-brace-format +msgid "Failed to retieve {0} (from ASP)." msgstr "Falhou para obter {0} (do ABS/rsync)." #: pkgbuilder/build.py:401 @@ -86,7 +87,8 @@ msgid "Building {0}..." msgstr "Construindo {0}..." #: pkgbuilder/build.py:445 -msgid "Retrieving from ABS..." +#, fuzzy +msgid "Retrieving from ASP..." msgstr "Recebendo do ABS..." #: pkgbuilder/build.py:454 pkgbuilder/build.py:478 @@ -184,7 +186,7 @@ msgid "An AUR helper (and library) in Python 3." msgstr "Uma biblioteca e helper do AUR em Python 3." #: pkgbuilder/__main__.py:42 -msgid "Also accepts ABS packages." +msgid "Also accepts repository packages to build from source." msgstr "" #: pkgbuilder/__main__.py:45 @@ -196,7 +198,8 @@ msgid "PACKAGE" msgstr "PACOTE" #: pkgbuilder/__main__.py:48 -msgid "AUR/ABS packages to build" +#, fuzzy +msgid "AUR/repository packages to build" msgstr "pacotes do AUR/ABS para construir" #: pkgbuilder/__main__.py:50 @@ -582,7 +585,8 @@ msgid "Didn’t pass any packages." msgstr "Não passou pacote nenhum." #: pkgbuilder/utils.py:134 -msgid "Trying to use utils.print_package_info with an ABS package" +#, fuzzy +msgid "Trying to use utils.print_package_info with a repository package" msgstr "Tentando usar utils.print_package_info com um pacote do ABS" #. TRANSLATORS: space it properly. “yes/no” below are diff --git a/locale/pt_BR/LC_MESSAGES/pkgbuilder.mo b/locale/pt_BR/LC_MESSAGES/pkgbuilder.mo index b9fc7ae..b62be82 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 3d9e13c..1672f0d 100644 --- a/locale/pt_BR/LC_MESSAGES/pkgbuilder.po +++ b/locale/pt_BR/LC_MESSAGES/pkgbuilder.po @@ -6,9 +6,9 @@ # Fábio Nogueira , 2016 msgid "" msgstr "" -"Project-Id-Version: 4.2.11\n" +"Project-Id-Version: 4.2.12\n" "Report-Msgid-Bugs-To: Chris Warrick \n" -"POT-Creation-Date: 2017-05-02 14:42+0200\n" +"POT-Creation-Date: 2017-05-13 15:31+0200\n" "PO-Revision-Date: 2016-03-27 23:10+0000\n" "Last-Translator: Fábio Nogueira \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/kwpolska/" @@ -54,7 +54,8 @@ msgid "Fetching package information..." msgstr "Buscando informações do pacote..." #: pkgbuilder/build.py:390 -msgid ":: Retrieving packages from abs..." +#, fuzzy +msgid ":: Retrieving packages from asp..." msgstr ":: Recuperando pacotes do abs..." #: pkgbuilder/build.py:393 @@ -64,7 +65,7 @@ msgstr "recuperando {0}" #: pkgbuilder/build.py:397 pkgbuilder/build.py:449 #, python-brace-format -msgid "Failed to retieve {0} (from ABS/rsync)." +msgid "Failed to retieve {0} (from ASP)." msgstr "" #: pkgbuilder/build.py:401 @@ -86,7 +87,8 @@ msgid "Building {0}..." msgstr "Construindo {0}..." #: pkgbuilder/build.py:445 -msgid "Retrieving from ABS..." +#, fuzzy +msgid "Retrieving from ASP..." msgstr "Recuperando do ABS..." #: pkgbuilder/build.py:454 pkgbuilder/build.py:478 @@ -184,7 +186,7 @@ msgid "An AUR helper (and library) in Python 3." msgstr "" #: pkgbuilder/__main__.py:42 -msgid "Also accepts ABS packages." +msgid "Also accepts repository packages to build from source." msgstr "" #: pkgbuilder/__main__.py:45 @@ -196,7 +198,7 @@ msgid "PACKAGE" msgstr "PACOTE" #: pkgbuilder/__main__.py:48 -msgid "AUR/ABS packages to build" +msgid "AUR/repository packages to build" msgstr "" #: pkgbuilder/__main__.py:50 @@ -579,7 +581,7 @@ msgid "Didn’t pass any packages." msgstr "" #: pkgbuilder/utils.py:134 -msgid "Trying to use utils.print_package_info with an ABS package" +msgid "Trying to use utils.print_package_info with a repository package" msgstr "" #. TRANSLATORS: space it properly. “yes/no” below are diff --git a/locale/sk/LC_MESSAGES/pkgbuilder.mo b/locale/sk/LC_MESSAGES/pkgbuilder.mo index 24c4419..594d619 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 8448ae5..da91b76 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.11\n" +"Project-Id-Version: 4.2.12\n" "Report-Msgid-Bugs-To: Chris Warrick \n" -"POT-Creation-Date: 2017-05-02 14:42+0200\n" +"POT-Creation-Date: 2017-05-13 15:31+0200\n" "PO-Revision-Date: 2015-09-08 15:37+0000\n" "Last-Translator: Chris Warrick \n" "Language-Team: Slovak (http://www.transifex.com/kwpolska/pkgbuilder/language/" @@ -53,7 +53,7 @@ msgid "Fetching package information..." msgstr "" #: pkgbuilder/build.py:390 -msgid ":: Retrieving packages from abs..." +msgid ":: Retrieving packages from asp..." msgstr "" #: pkgbuilder/build.py:393 @@ -63,7 +63,7 @@ msgstr "" #: pkgbuilder/build.py:397 pkgbuilder/build.py:449 #, python-brace-format -msgid "Failed to retieve {0} (from ABS/rsync)." +msgid "Failed to retieve {0} (from ASP)." msgstr "" #: pkgbuilder/build.py:401 @@ -85,7 +85,7 @@ msgid "Building {0}..." msgstr "" #: pkgbuilder/build.py:445 -msgid "Retrieving from ABS..." +msgid "Retrieving from ASP..." msgstr "" #: pkgbuilder/build.py:454 pkgbuilder/build.py:478 @@ -183,7 +183,7 @@ msgid "An AUR helper (and library) in Python 3." msgstr "" #: pkgbuilder/__main__.py:42 -msgid "Also accepts ABS packages." +msgid "Also accepts repository packages to build from source." msgstr "" #: pkgbuilder/__main__.py:45 @@ -195,7 +195,7 @@ msgid "PACKAGE" msgstr "" #: pkgbuilder/__main__.py:48 -msgid "AUR/ABS packages to build" +msgid "AUR/repository packages to build" msgstr "" #: pkgbuilder/__main__.py:50 @@ -577,7 +577,7 @@ msgid "Didn’t pass any packages." msgstr "" #: pkgbuilder/utils.py:134 -msgid "Trying to use utils.print_package_info with an ABS package" +msgid "Trying to use utils.print_package_info with a repository package" msgstr "" #. TRANSLATORS: space it properly. “yes/no” below are diff --git a/locale/sv/LC_MESSAGES/pkgbuilder.mo b/locale/sv/LC_MESSAGES/pkgbuilder.mo index 8ebb0cb..6d515cc 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 68d30cc..35a0d2f 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.11\n" +"Project-Id-Version: 4.2.12\n" "Report-Msgid-Bugs-To: Chris Warrick \n" -"POT-Creation-Date: 2017-05-02 14:42+0200\n" +"POT-Creation-Date: 2017-05-13 15:31+0200\n" "PO-Revision-Date: 2015-09-08 15:37+0000\n" "Last-Translator: Chris Warrick \n" "Language-Team: Swedish (http://www.transifex.com/kwpolska/pkgbuilder/" @@ -53,7 +53,7 @@ msgid "Fetching package information..." msgstr "" #: pkgbuilder/build.py:390 -msgid ":: Retrieving packages from abs..." +msgid ":: Retrieving packages from asp..." msgstr "" #: pkgbuilder/build.py:393 @@ -63,7 +63,7 @@ msgstr "" #: pkgbuilder/build.py:397 pkgbuilder/build.py:449 #, python-brace-format -msgid "Failed to retieve {0} (from ABS/rsync)." +msgid "Failed to retieve {0} (from ASP)." msgstr "" #: pkgbuilder/build.py:401 @@ -85,7 +85,7 @@ msgid "Building {0}..." msgstr "" #: pkgbuilder/build.py:445 -msgid "Retrieving from ABS..." +msgid "Retrieving from ASP..." msgstr "" #: pkgbuilder/build.py:454 pkgbuilder/build.py:478 @@ -183,7 +183,7 @@ msgid "An AUR helper (and library) in Python 3." msgstr "" #: pkgbuilder/__main__.py:42 -msgid "Also accepts ABS packages." +msgid "Also accepts repository packages to build from source." msgstr "" #: pkgbuilder/__main__.py:45 @@ -195,7 +195,7 @@ msgid "PACKAGE" msgstr "" #: pkgbuilder/__main__.py:48 -msgid "AUR/ABS packages to build" +msgid "AUR/repository packages to build" msgstr "" #: pkgbuilder/__main__.py:50 @@ -577,7 +577,7 @@ msgid "Didn’t pass any packages." msgstr "" #: pkgbuilder/utils.py:134 -msgid "Trying to use utils.print_package_info with an ABS package" +msgid "Trying to use utils.print_package_info with a repository package" msgstr "" #. TRANSLATORS: space it properly. “yes/no” below are diff --git a/locale/tr/LC_MESSAGES/pkgbuilder.mo b/locale/tr/LC_MESSAGES/pkgbuilder.mo index 0beba9f..4ef387c 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 c4a59dd..acc1f9b 100644 --- a/locale/tr/LC_MESSAGES/pkgbuilder.po +++ b/locale/tr/LC_MESSAGES/pkgbuilder.po @@ -10,9 +10,9 @@ # Yusuf Faruk DOĞAN , 2013 msgid "" msgstr "" -"Project-Id-Version: 4.2.11\n" +"Project-Id-Version: 4.2.12\n" "Report-Msgid-Bugs-To: Chris Warrick \n" -"POT-Creation-Date: 2017-05-02 14:42+0200\n" +"POT-Creation-Date: 2017-05-13 15:31+0200\n" "PO-Revision-Date: 2015-09-08 15:37+0000\n" "Last-Translator: Chris Warrick \n" "Language-Team: Turkish (http://www.transifex.com/kwpolska/pkgbuilder/" @@ -58,7 +58,8 @@ msgid "Fetching package information..." msgstr "Paket bilgisi alınıyor..." #: pkgbuilder/build.py:390 -msgid ":: Retrieving packages from abs..." +#, fuzzy +msgid ":: Retrieving packages from asp..." msgstr ":: ABS den paketler geri alınıyor..." #: pkgbuilder/build.py:393 @@ -67,8 +68,8 @@ msgid "retrieving {0}" msgstr "{0} geri alınıyor" #: pkgbuilder/build.py:397 pkgbuilder/build.py:449 -#, python-brace-format -msgid "Failed to retieve {0} (from ABS/rsync)." +#, fuzzy, python-brace-format +msgid "Failed to retieve {0} (from ASP)." msgstr "{0} geri yüklenmesi durdu (ABS/rsync ten)" #: pkgbuilder/build.py:401 @@ -90,7 +91,8 @@ msgid "Building {0}..." msgstr "{0} İnşa ediliyor..." #: pkgbuilder/build.py:445 -msgid "Retrieving from ABS..." +#, fuzzy +msgid "Retrieving from ASP..." msgstr "ABS den geri alınıyor..." #: pkgbuilder/build.py:454 pkgbuilder/build.py:478 @@ -188,7 +190,7 @@ msgid "An AUR helper (and library) in Python 3." msgstr "Python 3 içinde bir AUR yardımcısı (ve kütüphanesi)." #: pkgbuilder/__main__.py:42 -msgid "Also accepts ABS packages." +msgid "Also accepts repository packages to build from source." msgstr "" #: pkgbuilder/__main__.py:45 @@ -200,7 +202,8 @@ msgid "PACKAGE" msgstr "PAKET" #: pkgbuilder/__main__.py:48 -msgid "AUR/ABS packages to build" +#, fuzzy +msgid "AUR/repository packages to build" msgstr " İnşa edilecek AUR/ABS paketleri" #: pkgbuilder/__main__.py:50 @@ -586,7 +589,8 @@ msgid "Didn’t pass any packages." msgstr "Hiç bir paket atlanmadı." #: pkgbuilder/utils.py:134 -msgid "Trying to use utils.print_package_info with an ABS package" +#, fuzzy +msgid "Trying to use utils.print_package_info with a repository package" msgstr "ABS paketi ile utils.print_package_info kullanılmaya çalışılıyor" #. TRANSLATORS: space it properly. “yes/no” below are diff --git a/locale/vi/LC_MESSAGES/pkgbuilder.mo b/locale/vi/LC_MESSAGES/pkgbuilder.mo index 32719e0..f87908f 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 d385ed3..54d39db 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.11\n" +"Project-Id-Version: 4.2.12\n" "Report-Msgid-Bugs-To: Chris Warrick \n" -"POT-Creation-Date: 2017-05-02 14:42+0200\n" +"POT-Creation-Date: 2017-05-13 15:31+0200\n" "PO-Revision-Date: 2015-09-08 15:37+0000\n" "Last-Translator: Chris Warrick \n" "Language-Team: Vietnamese (http://www.transifex.com/kwpolska/pkgbuilder/" @@ -57,7 +57,8 @@ msgid "Fetching package information..." msgstr "Đang tải về thông tin của gói cài đặt..." #: pkgbuilder/build.py:390 -msgid ":: Retrieving packages from abs..." +#, fuzzy +msgid ":: Retrieving packages from asp..." msgstr ":: Đang nhận các gói cài đặt từ abs.." #: pkgbuilder/build.py:393 @@ -66,8 +67,8 @@ msgid "retrieving {0}" msgstr "đang nhận {0}" #: pkgbuilder/build.py:397 pkgbuilder/build.py:449 -#, python-brace-format -msgid "Failed to retieve {0} (from ABS/rsync)." +#, fuzzy, python-brace-format +msgid "Failed to retieve {0} (from ASP)." msgstr "Thất bại khi nhận {0} (từ ABS/rsync)." #: pkgbuilder/build.py:401 @@ -89,7 +90,8 @@ msgid "Building {0}..." msgstr "Đang xây dựng {0}..." #: pkgbuilder/build.py:445 -msgid "Retrieving from ABS..." +#, fuzzy +msgid "Retrieving from ASP..." msgstr "Đang nhận từ ABS..." #: pkgbuilder/build.py:454 pkgbuilder/build.py:478 @@ -187,7 +189,7 @@ msgid "An AUR helper (and library) in Python 3." msgstr "Tập tin trợ giúp AUR (và thư viện) ở định dạng Pythong 3" #: pkgbuilder/__main__.py:42 -msgid "Also accepts ABS packages." +msgid "Also accepts repository packages to build from source." msgstr "" #: pkgbuilder/__main__.py:45 @@ -199,7 +201,8 @@ msgid "PACKAGE" msgstr "GÓI CÀI ĐẶT" #: pkgbuilder/__main__.py:48 -msgid "AUR/ABS packages to build" +#, fuzzy +msgid "AUR/repository packages to build" msgstr "Gói cài đặt AUR/ABS để xây dựng" #: pkgbuilder/__main__.py:50 @@ -583,7 +586,8 @@ msgid "Didn’t pass any packages." msgstr "Vẫn chưa thông qua gói cài đặt nào." #: pkgbuilder/utils.py:134 -msgid "Trying to use utils.print_package_info with an ABS package" +#, fuzzy +msgid "Trying to use utils.print_package_info with a repository package" msgstr "Đang cố sử dụng utils.print_package_info với gói cài đặt ABS" #. TRANSLATORS: space it properly. “yes/no” below are diff --git a/messages.pot b/messages.pot index 01573b0..ada7b73 100644 --- a/messages.pot +++ b/messages.pot @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: 4.2.11\n" +"Project-Id-Version: 4.2.12\n" "Report-Msgid-Bugs-To: Chris Warrick \n" -"POT-Creation-Date: 2017-05-02 14:42+0200\n" -"PO-Revision-Date: 2017-05-02 14:42+0200\n" +"POT-Creation-Date: 2017-05-13 15:31+0200\n" +"PO-Revision-Date: 2017-05-13 15:31+0200\n" "Last-Translator: Chris Warrick \n" "Language-Team: Chris Warrick \n" "Language: en\n" @@ -51,7 +51,7 @@ msgid "Fetching package information..." msgstr "" #: pkgbuilder/build.py:390 -msgid ":: Retrieving packages from abs..." +msgid ":: Retrieving packages from asp..." msgstr "" #: pkgbuilder/build.py:393 @@ -61,7 +61,7 @@ msgstr "" #: pkgbuilder/build.py:397 pkgbuilder/build.py:449 #, python-brace-format -msgid "Failed to retieve {0} (from ABS/rsync)." +msgid "Failed to retieve {0} (from ASP)." msgstr "" #: pkgbuilder/build.py:401 @@ -83,7 +83,7 @@ msgid "Building {0}..." msgstr "" #: pkgbuilder/build.py:445 -msgid "Retrieving from ABS..." +msgid "Retrieving from ASP..." msgstr "" #: pkgbuilder/build.py:454 pkgbuilder/build.py:478 @@ -181,7 +181,7 @@ msgid "An AUR helper (and library) in Python 3." msgstr "" #: pkgbuilder/__main__.py:42 -msgid "Also accepts ABS packages." +msgid "Also accepts repository packages to build from source." msgstr "" #: pkgbuilder/__main__.py:45 @@ -193,7 +193,7 @@ msgid "PACKAGE" msgstr "" #: pkgbuilder/__main__.py:48 -msgid "AUR/ABS packages to build" +msgid "AUR/repository packages to build" msgstr "" #: pkgbuilder/__main__.py:50 @@ -575,7 +575,7 @@ msgid "Didn’t pass any packages." msgstr "" #: pkgbuilder/utils.py:134 -msgid "Trying to use utils.print_package_info with an ABS package" +msgid "Trying to use utils.print_package_info with a repository package" msgstr "" #. TRANSLATORS: space it properly. “yes/no” below are diff --git a/pkgbuilder/__init__.py b/pkgbuilder/__init__.py index 5efd6fc..8c90ba3 100644 --- a/pkgbuilder/__init__.py +++ b/pkgbuilder/__init__.py @@ -1,5 +1,5 @@ # -*- encoding: utf-8 -*- -# PKGBUILDer v4.2.11 +# PKGBUILDer v4.2.12 # An AUR helper (and library) in Python 3. # Copyright © 2011-2017, Chris Warrick. # All rights reserved. @@ -45,7 +45,7 @@ __title__ = 'PKGBUILDer' -__version__ = '4.2.11' +__version__ = '4.2.12' __author__ = 'Chris Warrick' __license__ = '3-clause BSD' __docformat__ = 'restructuredtext en' diff --git a/pkgbuilder/__main__.py b/pkgbuilder/__main__.py index 4b50041..40bc319 100644 --- a/pkgbuilder/__main__.py +++ b/pkgbuilder/__main__.py @@ -1,5 +1,5 @@ # -*- encoding: utf-8 -*- -# PKGBUILDer v4.2.11 +# PKGBUILDer v4.2.12 # An AUR helper (and library) in Python 3. # Copyright © 2011-2017, Chris Warrick. # See /LICENSE for licensing information. @@ -39,13 +39,13 @@ def main(source='AUTO', quit=True): parser = argparse.ArgumentParser( prog='pkgbuilder', description=_('An AUR helper (and library) in Python 3.'), - epilog=_('Also accepts ABS packages.')) + epilog=_('Also accepts repository packages to build from source.')) parser.add_argument( '-V', '--version', action='version', version=verstring, help=_('show version number and quit')) parser.add_argument( 'pkgnames', metavar=_('PACKAGE'), action='store', nargs='*', - help=_('AUR/ABS packages to build')) + help=_('AUR/repository packages to build')) argopr = parser.add_argument_group(_('operations')) argopr.add_argument( diff --git a/pkgbuilder/aur.py b/pkgbuilder/aur.py index bd75cf7..d9b7b67 100644 --- a/pkgbuilder/aur.py +++ b/pkgbuilder/aur.py @@ -1,5 +1,5 @@ # -*- encoding: utf-8 -*- -# PKGBUILDer v4.2.11 +# PKGBUILDer v4.2.12 # An AUR helper (and library) in Python 3. # Copyright © 2011-2017, Chris Warrick. # See /LICENSE for licensing information. diff --git a/pkgbuilder/build.py b/pkgbuilder/build.py index 8585563..25ac95a 100644 --- a/pkgbuilder/build.py +++ b/pkgbuilder/build.py @@ -1,5 +1,5 @@ # -*- encoding: utf-8 -*- -# PKGBUILDer v4.2.11 +# PKGBUILDer v4.2.12 # An AUR helper (and library) in Python 3. # Copyright © 2011-2017, Chris Warrick. # See /LICENSE for licensing information. @@ -28,7 +28,7 @@ import functools import glob -__all__ = ('auto_build', 'clone', 'rsync', 'prepare_deps', 'depcheck', +__all__ = ('auto_build', 'clone', 'asp_export', 'prepare_deps', 'depcheck', 'fetch_runner', 'build_runner') @@ -160,18 +160,18 @@ def clone(pkgbase): def rsync(pkg, quiet=False): - """Run rsync for a package.""" - if quiet: - qv = '--quiet' - else: - qv = '--verbose' - return DS.run_command(['rsync', qv, '-mr', '--no-motd', '--delete-after', - '--no-p', '--no-o', '--no-g', - '--include=/{0}'.format(pkg.repo), - '--include=/{0}/{1}'.format(pkg.repo, pkg.name), - '--exclude=/{0}/*'.format(pkg.repo), '--exclude=/*', - 'rsync.archlinux.org::abs/{0}/'.format(pkg.arch), - '.']) + """Deprecated. Use `asp_export` instead. + + .. deprecated: 4.2.12""" + asp_export(pkg) + + +def asp_export(pkg): + """Export a package from ASP to the current working directory. + + .. versionadded: 4.2.12""" + subprocess.check_call(['asp', 'update', pkg.name]) + return subprocess.call(['asp', 'export', pkg.name]) def _check_and_append(data, field, out): @@ -364,7 +364,7 @@ def fetch_runner(pkgnames, preprocessed=False): except IndexError: try: DS.log.info('{0} not found in the AUR, checking in ' - 'ABS'.format(pkgname)) + 'repositories'.format(pkgname)) syncpkgs = [] for j in [i.pkgcache for i in DS.pyc.get_syncdbs()]: syncpkgs.append(j) @@ -387,15 +387,15 @@ def fetch_runner(pkgnames, preprocessed=False): aurpkgs.append(pkg) if abspkgs: - print(_(':: Retrieving packages from abs...')) + print(_(':: Retrieving packages from asp...')) pm = pkgbuilder.ui.Progress(len(abspkgs)) for pkg in abspkgs: pm.msg(_('retrieving {0}').format(pkg.name), True) - rc = rsync(pkg, True) + rc = asp_export(pkg) if rc > 0: raise pkgbuilder.exceptions.NetworkError( - _('Failed to retieve {0} (from ABS/rsync).').format( - pkg.name), source='rsync', pkg=pkg, retcode=rc) + _('Failed to retieve {0} (from ASP).').format( + pkg.name), source='asp', pkg=pkg, retcode=rc) if aurpkgs: print(_(':: Retrieving packages from aur...')) @@ -421,7 +421,7 @@ def build_runner(pkgname, performdepcheck=True, try: pkg = pkgbuilder.utils.info([pkgname])[0] except IndexError: - DS.log.info('{0} not found in the AUR, checking in ABS'.format( + DS.log.info('{0} not found in the AUR, checking in repositories'.format( pkgname)) syncpkgs = [] for j in [i.pkgcache for i in DS.pyc.get_syncdbs()]: @@ -442,12 +442,12 @@ def build_runner(pkgname, performdepcheck=True, prefixp=' -> ') sys.stdout.write(DS.colors['all_off']) if pkg.is_abs: - DS.fancy_msg(_('Retrieving from ABS...')) - rc = rsync(pkg) + DS.fancy_msg(_('Retrieving from ASP...')) + rc = asp_export(pkg) if rc > 0: raise pkgbuilder.exceptions.NetworkError( - _('Failed to retieve {0} (from ABS/rsync).').format( - pkg.name), pkg=pkg, retcode=rc) + _('Failed to retieve {0} (from ASP).').format( + pkg.name), source='asp', pkg=pkg, retcode=rc) existing = find_packagefile(pkg.name) if any(pkg.name in i for i in existing[0]): @@ -457,18 +457,18 @@ def build_runner(pkgname, performdepcheck=True, existing = ([], []) return [72336, existing] try: - os.chdir('./{0}/{1}'.format(pkg.repo, pkg.name)) + os.chdir('./{0}'.format(pkg.name)) except FileNotFoundError: raise pkgbuilder.exceptions.PBException( 'The package download failed.\n This package might ' 'be generated from a split PKGBUILD. Please find out the ' 'name of the “main” package (eg. python- instead of python2-) ' - 'and try again.', '/'.join((pkg.repo, pkg.name)), exit=False) + 'and try again.', pkg.name, exit=False) if not os.path.exists('.SRCINFO'): - # Create a .SRCINFO file for ABS packages. + # Create a .SRCINFO file for ASP/repo packages. # Slightly hacky, but saves us work on parsing bash. - DS.log.debug("Creating .SRCINFO for ABS package") + DS.log.debug("Creating .SRCINFO for repository package") srcinfo = subprocess.check_output(["makepkg", "--printsrcinfo"]) with open(".SRCINFO", "wb") as fh: fh.write(srcinfo) diff --git a/pkgbuilder/exceptions.py b/pkgbuilder/exceptions.py index 859a85b..88147c6 100644 --- a/pkgbuilder/exceptions.py +++ b/pkgbuilder/exceptions.py @@ -1,5 +1,5 @@ # -*- encoding: utf-8 -*- -# PKGBUILDer v4.2.11 +# PKGBUILDer v4.2.12 # An AUR helper (and library) in Python 3. # Copyright © 2011-2017, Chris Warrick. # See /LICENSE for licensing information. diff --git a/pkgbuilder/package.py b/pkgbuilder/package.py index a98b9fb..73ee059 100644 --- a/pkgbuilder/package.py +++ b/pkgbuilder/package.py @@ -1,5 +1,5 @@ # -*- encoding: utf-8 -*- -# PKGBUILDer v4.2.11 +# PKGBUILDer v4.2.12 # An AUR helper (and library) in Python 3. # Copyright © 2011-2017, Chris Warrick. # See /LICENSE for licensing information. @@ -52,7 +52,7 @@ def __str__(self): def __repr__(self): """Return something nice for people wanting a repr.""" if self.is_abs: - return ''.format(self.name, self.version) + return ''.format(self.name, self.version) elif not self.is_abs: return ''.format(self.name, self.version) elif self.is_abs is None: @@ -132,7 +132,7 @@ def from_aurdict(cls, aurdict): class ABSPackage(Package): - """An ABS package.""" + """A repository package (formerly ABS).""" is_abs = True # Most of those aren’t necessary, but I am copying them over because I can. @@ -153,7 +153,7 @@ class ABSPackage(Package): size = None @classmethod - def from_pyalpm(cls, abspkg): + def from_pyalpm(cls, alpmpkg): """Transform a pyalpm.Package into a pkgbuilder.package.ABSPackage.""" copy = ['arch', 'backup', 'base64_sig', 'conflicts', 'deltas', 'depends', 'download_size', 'filename', 'files', 'groups', @@ -163,12 +163,12 @@ def from_pyalpm(cls, abspkg): p = cls() for i in copy: - setattr(p, i, getattr(abspkg, i)) + setattr(p, i, getattr(alpmpkg, i)) - p.repo = abspkg.db.name - p.description = abspkg.desc - p.human = abspkg.packager - p.builddate = mktime(abspkg.builddate) - p.installdate = mktime(abspkg.installdate) + p.repo = alpmpkg.db.name + p.description = alpmpkg.desc + p.human = alpmpkg.packager + p.builddate = mktime(alpmpkg.builddate) + p.installdate = mktime(alpmpkg.installdate) return p diff --git a/pkgbuilder/pbds.py b/pkgbuilder/pbds.py index cebb480..64f118b 100644 --- a/pkgbuilder/pbds.py +++ b/pkgbuilder/pbds.py @@ -1,5 +1,5 @@ # -*- encoding: utf-8 -*- -# PKGBUILDer v4.2.11 +# PKGBUILDer v4.2.12 # An AUR helper (and library) in Python 3. # Copyright © 2011-2017, Chris Warrick. # See /LICENSE for licensing information. diff --git a/pkgbuilder/transaction.py b/pkgbuilder/transaction.py index 1de9a15..00c4f71 100644 --- a/pkgbuilder/transaction.py +++ b/pkgbuilder/transaction.py @@ -1,5 +1,5 @@ # -*- encoding: utf-8 -*- -# PKGBUILDer v4.2.11 +# PKGBUILDer v4.2.12 # An AUR helper (and library) in Python 3. # Copyright © 2011-2017, Chris Warrick. # See /LICENSE for licensing information. diff --git a/pkgbuilder/ui.py b/pkgbuilder/ui.py index 36e5f50..27e40c5 100644 --- a/pkgbuilder/ui.py +++ b/pkgbuilder/ui.py @@ -1,5 +1,5 @@ # -*- encoding: utf-8 -*- -# PKGBUILDer v4.2.11 +# PKGBUILDer v4.2.12 # An AUR helper (and library) in Python 3. # Copyright © 2011-2017, Chris Warrick. # See /LICENSE for licensing information. diff --git a/pkgbuilder/upgrade.py b/pkgbuilder/upgrade.py index ebd5bcd..643ed19 100644 --- a/pkgbuilder/upgrade.py +++ b/pkgbuilder/upgrade.py @@ -1,5 +1,5 @@ # -*- encoding: utf-8 -*- -# PKGBUILDer v4.2.11 +# PKGBUILDer v4.2.12 # An AUR helper (and library) in Python 3. # Copyright © 2011-2017, Chris Warrick. # See /LICENSE for licensing information. diff --git a/pkgbuilder/utils.py b/pkgbuilder/utils.py index 280b77e..c9f8523 100644 --- a/pkgbuilder/utils.py +++ b/pkgbuilder/utils.py @@ -1,5 +1,5 @@ # -*- encoding: utf-8 -*- -# PKGBUILDer v4.2.11 +# PKGBUILDer v4.2.12 # An AUR helper (and library) in Python 3. # Copyright © 2011-2017, Chris Warrick. # See /LICENSE for licensing information. @@ -93,7 +93,7 @@ def print_package_search(pkg, cachemode=False, prefix='', prefixp=''): installed = (installed + ' ' + DS.colors['red'] + _('[out of date]') + DS.colors['all_off']) except AttributeError: - pass # for ABS packages + pass # for repository packages category = pkg.repo @@ -132,7 +132,7 @@ def print_package_info(pkgs, cachemode=False): for i in pkgs: if not isinstance(i, AURPackage): raise SanityError(_('Trying to use utils.print_package_info ' - 'with an ABS package'), + 'with a repository package'), source='utils.print_package_info') loct = os.getenv('LC_TIME') loc = os.getenv('LC_ALL') diff --git a/pkgbuilder/wrapper.py b/pkgbuilder/wrapper.py index 2eb02d3..16fb102 100644 --- a/pkgbuilder/wrapper.py +++ b/pkgbuilder/wrapper.py @@ -1,6 +1,6 @@ # -*- encoding: utf-8 -*- # PBWrapper v0.5.0 -# PKGBUILDer v4.2.11 +# PKGBUILDer v4.2.12 # An AUR helper (and library) in Python 3. # Copyright © 2011-2017, Chris Warrick. # See /LICENSE for licensing information. diff --git a/setup.py b/setup.py index 198fd1c..8efdb5e 100755 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ def run_tests(self): sys.exit(errno) setup(name='pkgbuilder', - version='4.2.11', + version='4.2.12', description='An AUR helper (and library) in Python 3.', keywords='arch pkgbuild', author='Chris Warrick', diff --git a/tests/test_pkgbuilder.py b/tests/test_pkgbuilder.py index 5e82c79..7a2ebf5 100755 --- a/tests/test_pkgbuilder.py +++ b/tests/test_pkgbuilder.py @@ -49,7 +49,7 @@ class TestPB(unittest.TestCase): fpkg = pkgbuilder.package.AURPackage.from_aurdict({ 'Description': 'A Python AUR helper/library.', 'CategoryID': 16, 'ID': 52542, 'Maintainer': 'Kwpolska', - 'Depends': ['python', 'pyalpm>=0.5.1-1', 'python-requests', 'rsync'], + 'Depends': ['python', 'pyalpm>=0.5.1-1', 'python-requests', 'asp'], 'URLPath': '/packages/pk/pkgbuilder/pkgbuilder.tar.gz', 'Version': '3.2.0-1', 'PackageBase': 'pkgbuilder', 'FirstSubmitted': 1316529993, 'OutOfDate': 1000, 'NumVotes': 19, 'Name': 'pkgbuilderts', 'LastModified': @@ -94,7 +94,7 @@ def test_utils_print_package_info(self): 'Licenses : BSD\n' 'Groups : None\n' 'Provides : None\n' - 'Depends On : python pyalpm>=0.5.1-1 python-requests rsync\n' + 'Depends On : python pyalpm>=0.5.1-1 python-requests asp\n' 'Make Deps : None\n' 'Check Deps : None\n' 'Optional Deps : None\n'