diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 25608a4..ab58442 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,8 +5,8 @@ Appendix C. Changelog :Author: Kwpolska :Copyright: © 2011-2012, Kwpolska. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2012-10-10 -:Version: 2.1.5.2 +:Date: 2012-10-12 +:Version: 2.1.5.3 .. index:: CHANGELOG @@ -23,6 +23,10 @@ PKGBUILDer uses the following versioning scheme: Generation 2 ============ +:2.1.5.3: A bugfix for package copying and installation (signatures were passed + to -U) broke the installation mechanism so only one package got + installed. Also, fixing a bug with a STDIN that is not a terminal + (eg. ``xargs``, and I hope nobody is using it to search for stuff) :2.1.5.2: Fixed a bug where an error in makepkg while running an Upgrade crashed PB and thrown an unhelpful traceback. :2.1.5.1: More tiny bugfixes. diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 7906f80..64c406c 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -4,8 +4,8 @@ Appendix D. Contribution rules :Author: Kwpolska :Copyright: © 2011-2012, Kwpolska. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2012-10-10 -:Version: 2.1.5.2 +:Date: 2012-10-12 +:Version: 2.1.5.3 Do you want to contribute to this project? Great! I’d love to see some help, but you need to comply with some easy rules. diff --git a/PKGBUILD b/PKGBUILD index bbd07b9..2270453 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Kwpolska pkgname=pkgbuilder -pkgver=2.1.5.2 +pkgver=2.1.5.3 pkgrel=1 pkgdesc='A Python AUR helper/library.' arch=('any') @@ -9,7 +9,7 @@ license=('BSD') depends=('python' 'pyalpm>=0.5.1-1' 'python-requests') options=(!emptydirs) source=("http://pypi.python.org/packages/source/p/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('963e7c3fe077e37b4546ae75e72674a1') +md5sums=('92b51e17409e0c474cce4f0480121f77') package() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/PKGBUILD-git b/PKGBUILD-git index a7936f9..3ed9c4f 100644 --- a/PKGBUILD-git +++ b/PKGBUILD-git @@ -1,6 +1,6 @@ # Maintainer: Kwpolska pkgname=pkgbuilder-git -pkgver=20121010 +pkgver=20121012 pkgrel=1 pkgdesc='A Python AUR helper/library. Version from git.' arch=('any') diff --git a/README b/README index ccad6dd..cef5f46 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: Kwpolska -:Date: 2012-10-10 -:Version: 2.1.5.2 +:Date: 2012-10-12 +:Version: 2.1.5.3 .. index: README diff --git a/README.rst b/README.rst index ccad6dd..cef5f46 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: Kwpolska -:Date: 2012-10-10 -:Version: 2.1.5.2 +:Date: 2012-10-12 +:Version: 2.1.5.3 .. index: README diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 25608a4..ab58442 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -5,8 +5,8 @@ Appendix C. Changelog :Author: Kwpolska :Copyright: © 2011-2012, Kwpolska. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2012-10-10 -:Version: 2.1.5.2 +:Date: 2012-10-12 +:Version: 2.1.5.3 .. index:: CHANGELOG @@ -23,6 +23,10 @@ PKGBUILDer uses the following versioning scheme: Generation 2 ============ +:2.1.5.3: A bugfix for package copying and installation (signatures were passed + to -U) broke the installation mechanism so only one package got + installed. Also, fixing a bug with a STDIN that is not a terminal + (eg. ``xargs``, and I hope nobody is using it to search for stuff) :2.1.5.2: Fixed a bug where an error in makepkg while running an Upgrade crashed PB and thrown an unhelpful traceback. :2.1.5.1: More tiny bugfixes. diff --git a/docs/CONTRIBUTING.rst b/docs/CONTRIBUTING.rst index 7906f80..64c406c 100644 --- a/docs/CONTRIBUTING.rst +++ b/docs/CONTRIBUTING.rst @@ -4,8 +4,8 @@ Appendix D. Contribution rules :Author: Kwpolska :Copyright: © 2011-2012, Kwpolska. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2012-10-10 -:Version: 2.1.5.2 +:Date: 2012-10-12 +:Version: 2.1.5.3 Do you want to contribute to this project? Great! I’d love to see some help, but you need to comply with some easy rules. diff --git a/docs/LICENSE.rst b/docs/LICENSE.rst index 623f2c7..a778670 100644 --- a/docs/LICENSE.rst +++ b/docs/LICENSE.rst @@ -3,8 +3,8 @@ Appendix B. License for PKGBUILDer ================================== :Info: This is the license for PKGBUILDer. :Author: Kwpolska -:Date: 2012-10-10 -:Version: 2.1.5.2 +:Date: 2012-10-12 +:Version: 2.1.5.3 .. index:: LICENSE diff --git a/docs/README.rst b/docs/README.rst index ccad6dd..cef5f46 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: Kwpolska -:Date: 2012-10-10 -:Version: 2.1.5.2 +:Date: 2012-10-12 +:Version: 2.1.5.3 .. index: README diff --git a/docs/TODO.rst b/docs/TODO.rst index 89f5ed0..6daf4b3 100644 --- a/docs/TODO.rst +++ b/docs/TODO.rst @@ -3,8 +3,8 @@ Appendix E. TODO for PKGBUILDer =============================== :Author: Kwpolska :Copyright: See Appendix B. -:Date: 2012-10-10 -:Version: 2.1.5.2 +:Date: 2012-10-12 +:Version: 2.1.5.3 .. index:: TODO diff --git a/docs/aur.rst b/docs/aur.rst index 2409d81..5a063ed 100644 --- a/docs/aur.rst +++ b/docs/aur.rst @@ -4,8 +4,8 @@ aur module (AUR class) :Author: Kwpolska :Copyright: © 2011-2012, Kwpolska. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2012-10-10 -:Version: 2.1.5.2 +:Date: 2012-10-12 +:Version: 2.1.5.3 .. module:: aur diff --git a/docs/build.rst b/docs/build.rst index f91b985..759d092 100644 --- a/docs/build.rst +++ b/docs/build.rst @@ -4,8 +4,8 @@ build module (Build class) :Author: Kwpolska :Copyright: © 2011-2012, Kwpolska. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2012-10-10 -:Version: 2.1.5.2 +:Date: 2012-10-12 +:Version: 2.1.5.3 .. module:: build @@ -46,11 +46,9 @@ standalone, because it is embedded by :meth:`auto_build()`. Check if packages were installed. -.. method:: install(pkgpaths) +.. method:: install(pkgpaths[, sigpaths]) -Install packages through ``pacman -U``. Warning:: - - pkgpaths = [packages, sigfiles-if-any-or-None] +Install packages through ``pacman -U``. .. method:: download(urlpath, filename[, prot]) diff --git a/docs/conf.py b/docs/conf.py index d4f4912..75e345a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -50,7 +50,7 @@ # The short X.Y version. version = '2.1.5' # The full version, including alpha/beta/rc tags. -release = '2.1.5.2' +release = '2.1.5.3' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/localization.rst b/docs/localization.rst index 15c8baa..d49f470 100644 --- a/docs/localization.rst +++ b/docs/localization.rst @@ -4,8 +4,8 @@ Appendix A. Localization Guide :Author: Kwpolska :Copyright: © 2011-2012, Kwpolska. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2012-10-10 -:Version: 2.1.5.2 +:Date: 2012-10-12 +:Version: 2.1.5.3 .. index:: locale diff --git a/docs/main.rst b/docs/main.rst index 6b07a10..16ef699 100644 --- a/docs/main.rst +++ b/docs/main.rst @@ -4,8 +4,8 @@ main module :Author: Kwpolska :Copyright: © 2011-2012, Kwpolska. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2012-10-10 -:Version: 2.1.5.2 +:Date: 2012-10-12 +:Version: 2.1.5.3 .. index:: main .. versionadded:: 2.1.3.0 diff --git a/docs/pb.8.gz b/docs/pb.8.gz index 1cd1461..d78e771 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 0911956..17d5643 100644 --- a/docs/pb.rst +++ b/docs/pb.rst @@ -6,8 +6,8 @@ PBWrapper :Author: Kwpolska :Copyright: © 2011-2012, Kwpolska. :License: BSD (see /LICENSE or Appendix B.) -:Date: 2012-10-10 -:Version: 2.1.5.2 +:Date: 2012-10-12 +:Version: 2.1.5.3 :Wrapper Version: 0.1.4 :Manual section: 8 :Manual group: PKGBUILDer manual diff --git a/docs/pbds.rst b/docs/pbds.rst index 83dc99f..4052739 100644 --- a/docs/pbds.rst +++ b/docs/pbds.rst @@ -5,8 +5,8 @@ pbds module (PBDS class) :Author: Kwpolska :Copyright: © 2011-2012, Kwpolska. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2012-10-10 -:Version: 2.1.5.2 +:Date: 2012-10-12 +:Version: 2.1.5.3 .. module: pbds diff --git a/docs/pkgbuilder.8.gz b/docs/pkgbuilder.8.gz index a4ecd75..435054b 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 d68c1dc..f0a3eba 100644 --- a/docs/pkgbuilder.rst +++ b/docs/pkgbuilder.rst @@ -6,8 +6,8 @@ PKGBUILDer :Author: Kwpolska :Copyright: © 2011-2012, Kwpolska. :License: BSD (see /LICENSE or Appendix B.) -:Date: 2012-10-10 -:Version: 2.1.5.2 +:Date: 2012-10-12 +:Version: 2.1.5.3 :Manual section: 8 :Manual group: PKGBUILDer manual diff --git a/docs/sample-scripts.rst b/docs/sample-scripts.rst index 734225c..72f02fb 100644 --- a/docs/sample-scripts.rst +++ b/docs/sample-scripts.rst @@ -4,8 +4,8 @@ PKGBUILDer Sample Scripts :Author: Kwpolska :Copyright: © 2011-2012, Kwpolska. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2012-10-10 -:Version: 2.1.5.2 +:Date: 2012-10-12 +:Version: 2.1.5.3 .. index:: sample scripts diff --git a/docs/upgrade.rst b/docs/upgrade.rst index 4f11997..cde041b 100644 --- a/docs/upgrade.rst +++ b/docs/upgrade.rst @@ -5,8 +5,8 @@ upgrade module (Upgrade class) :Author: Kwpolska :Copyright: © 2011-2012, Kwpolska. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2012-10-10 -:Version: 2.1.5.2 +:Date: 2012-10-12 +:Version: 2.1.5.3 .. module:: upgrade diff --git a/docs/utils.rst b/docs/utils.rst index 4be0f72..6e4b0cb 100644 --- a/docs/utils.rst +++ b/docs/utils.rst @@ -5,8 +5,8 @@ utils module (Utils class) :Author: Kwpolska :Copyright: © 2011-2012, Kwpolska. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2012-10-10 -:Version: 2.1.5.2 +:Date: 2012-10-12 +:Version: 2.1.5.3 .. module:: utils diff --git a/docs/wrapper.rst b/docs/wrapper.rst index db8c697..55d1288 100644 --- a/docs/wrapper.rst +++ b/docs/wrapper.rst @@ -4,8 +4,8 @@ PBWrapper :Author: Kwpolska :Copyright: © 2011-2012, Kwpolska. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2012-10-10 -:Version: 2.1.5.2 +:Date: 2012-10-12 +:Version: 2.1.5.3 :PBWrapper Version: 0.1.4 .. index:: wrapper diff --git a/locale/en/LC_MESSAGES/pkgbuilder.mo b/locale/en/LC_MESSAGES/pkgbuilder.mo index e83674e..5f963a4 100644 Binary files a/locale/en/LC_MESSAGES/pkgbuilder.mo and b/locale/en/LC_MESSAGES/pkgbuilder.mo differ diff --git a/locale/en/LC_MESSAGES/pkgbuilder.po b/locale/en/LC_MESSAGES/pkgbuilder.po index b1e336d..349d150 100644 --- a/locale/en/LC_MESSAGES/pkgbuilder.po +++ b/locale/en/LC_MESSAGES/pkgbuilder.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: 2.1.5.2\n" +"Project-Id-Version: 2.1.5.3\n" "Report-Msgid-Bugs-To: Kwpolska \n" -"POT-Creation-Date: 2012-10-10 20:33+0200\n" +"POT-Creation-Date: 2012-10-12 20:45+0200\n" "PO-Revision-Date: 2012-09-08 12:44+0100\n" "Last-Translator: Kwpolska \n" "Language-Team: Kwpolska \n" @@ -36,27 +36,27 @@ msgstr "{}: outdated {}" msgid "{}: installed {}" msgstr "{}: installed {}" -#: pkgbuilder/build.py:72 +#: pkgbuilder/build.py:68 msgid "Installing built packages..." msgstr "Installing built packages..." -#: pkgbuilder/build.py:109 +#: pkgbuilder/build.py:96 msgid "The build function reported a proper build." msgstr "The build function reported a proper build." #. PBxxx. -#: pkgbuilder/build.py:112 +#: pkgbuilder/build.py:99 msgid "makepkg (or someone else) failed and returned {}." msgstr "makepkg (or someone else) failed and returned {}." #. PBSUX. -#: pkgbuilder/build.py:116 +#: pkgbuilder/build.py:103 msgid "PKGBUILDer had a problem." msgstr "PKGBUILDer had a problem." #. PBREQ. #. TRANSLATORS: do not translate the word 'requests'. -#: pkgbuilder/build.py:120 +#: pkgbuilder/build.py:107 msgid "" "PKGBUILDer (or the requests library) had problems with fulfilling an HTTP " "request." @@ -65,73 +65,73 @@ msgstr "" "request." #. I/O error. -#: pkgbuilder/build.py:124 +#: pkgbuilder/build.py:111 msgid "There was an input/output error." msgstr "There was an input/output error." #. PBDEP. -#: pkgbuilder/build.py:127 +#: pkgbuilder/build.py:114 msgid "Building more AUR packages is required." msgstr "Building more AUR packages is required." -#: pkgbuilder/build.py:160 +#: pkgbuilder/build.py:147 msgid "download: HTTP Error {}" msgstr "download: HTTP Error {}" -#: pkgbuilder/build.py:163 +#: pkgbuilder/build.py:150 msgid "download: 0 bytes downloaded" msgstr "download: 0 bytes downloaded" -#: pkgbuilder/build.py:179 +#: pkgbuilder/build.py:166 msgid "extract: no files extracted" msgstr "extract: no files extracted" -#: pkgbuilder/build.py:230 +#: pkgbuilder/build.py:217 msgid "depcheck: cannot find {} anywhere" msgstr "depcheck: cannot find {} anywhere" -#: pkgbuilder/build.py:245 +#: pkgbuilder/build.py:232 msgid "Package {} not found." msgstr "Package {} not found." -#: pkgbuilder/build.py:247 +#: pkgbuilder/build.py:234 msgid "Building {}..." msgstr "Building {}..." #. Okay, this package exists, great then. Thanks, user. -#: pkgbuilder/build.py:257 +#: pkgbuilder/build.py:244 msgid "Downloading the tarball..." msgstr "Downloading the tarball..." -#: pkgbuilder/build.py:260 +#: pkgbuilder/build.py:247 msgid "{} kB downloaded" msgstr "{} kB downloaded" -#: pkgbuilder/build.py:262 +#: pkgbuilder/build.py:249 msgid "Extracting..." msgstr "Extracting..." -#: pkgbuilder/build.py:263 +#: pkgbuilder/build.py:250 msgid "{} files extracted" msgstr "{} files extracted" -#: pkgbuilder/build.py:268 +#: pkgbuilder/build.py:255 msgid "Checking dependencies..." msgstr "Checking dependencies..." -#: pkgbuilder/build.py:271 +#: pkgbuilder/build.py:258 msgid "found in system" msgstr "found in system" -#: pkgbuilder/build.py:271 +#: pkgbuilder/build.py:258 msgid "found in repos" msgstr "found in repos" -#: pkgbuilder/build.py:272 +#: pkgbuilder/build.py:259 msgid "found in the AUR" msgstr "found in the AUR" -#: pkgbuilder/build.py:275 +#: pkgbuilder/build.py:262 msgid "none found" msgstr "none found" @@ -227,11 +227,11 @@ msgstr "Search query too short, API limitation" msgid "Searching for exact match..." msgstr "Searching for exact match..." -#: pkgbuilder/main.py:129 INSTALL.py:65 INSTALL.py:74 INSTALL.py:83 +#: pkgbuilder/main.py:129 INSTALL.py:65 INSTALL.py:74 msgid "not found" msgstr "not found" -#: pkgbuilder/main.py:181 pkgbuilder/upgrade.py:173 +#: pkgbuilder/main.py:181 pkgbuilder/upgrade.py:174 msgid "Running PKGBUILDer as root can break your system!" msgstr "Running PKGBUILDer as root can break your system!" @@ -285,29 +285,29 @@ msgstr "Targets ({}): " msgid "Proceed with installation? [Y/n] " msgstr "Proceed with installation? [Y/n] " -#: pkgbuilder/utils.py:76 +#: pkgbuilder/utils.py:82 msgid " [installed: {}]" msgstr " [installed: {}]" -#: pkgbuilder/utils.py:78 +#: pkgbuilder/utils.py:84 msgid " [installed]" msgstr " [installed]" -#: pkgbuilder/utils.py:81 +#: pkgbuilder/utils.py:87 msgid "[out of date]" msgstr "[out of date]" -#: pkgbuilder/utils.py:93 +#: pkgbuilder/utils.py:99 msgid "votes" msgstr "votes" -#: pkgbuilder/utils.py:111 +#: pkgbuilder/utils.py:117 msgid "Package not found." msgstr "Package not found." #. TRANSLATORS: space it properly. `yes/no' below are #. for `out of date'. -#: pkgbuilder/utils.py:141 +#: pkgbuilder/utils.py:147 msgid "" "Repository : aur\n" "Category : {cat}\n" @@ -335,11 +335,11 @@ msgstr "" "Last Updated : {upd}\n" "Description : {dsc}\n" -#: pkgbuilder/utils.py:171 +#: pkgbuilder/utils.py:177 msgid "yes" msgstr "yes" -#: pkgbuilder/utils.py:173 +#: pkgbuilder/utils.py:179 msgid "no" msgstr "no" @@ -375,11 +375,11 @@ msgstr "" msgid "Performing a dependency check..." msgstr "Performing a dependency check..." -#: INSTALL.py:62 INSTALL.py:71 INSTALL.py:80 +#: INSTALL.py:62 INSTALL.py:71 msgid "found" msgstr "found" -#: INSTALL.py:105 +#: INSTALL.py:96 msgid "" "\n" "\n" @@ -401,7 +401,7 @@ msgstr "" "\n" "If I am wrong, though, congratulations!\n" -#: INSTALL.py:123 +#: INSTALL.py:114 msgid "" "Hello!\n" "\n" @@ -419,15 +419,15 @@ msgstr "" "and compile the package manually.\n" "\n" -#: INSTALL.py:132 +#: INSTALL.py:123 msgid "Hit Enter/Return to continue. " msgstr "Hit Enter/Return to continue. " -#: INSTALL.py:144 +#: INSTALL.py:135 msgid "Installing missing AUR dependencies..." msgstr "Installing missing AUR dependencies..." -#: INSTALL.py:153 +#: INSTALL.py:142 msgid "" "\n" "\n" @@ -455,7 +455,7 @@ msgstr "" "(zsh users: hash -r, other shells may need another command). For\n" "python module usage, type `import pkgbuilder` into the python prompt.\n" -#: INSTALL.py:169 +#: INSTALL.py:158 msgid "" "It looks like you want to quit. Okay then, goodbye.\n" "No work has been started yet.\n" @@ -469,7 +469,7 @@ msgstr "" "If that's what you want to do, go for it. If it isn't, run this\n" "script again." -#: INSTALL.py:175 +#: INSTALL.py:164 msgid "" "It looks like you want to quit. Okay then, goodbye.\n" "All the files this script was working on are placed in\n" @@ -492,14 +492,14 @@ msgstr "" msgid "usage" msgstr "usage" -#: localeprovider.py:2 +#: localeprovider.py:3 msgid "positional arguments" msgstr "positional arguments" -#: localeprovider.py:2 +#: localeprovider.py:4 msgid "optional arguments" msgstr "optional arguments" -#: localeprovider.py:2 +#: localeprovider.py:5 msgid "show this help message and exit" msgstr "show this help message and quit" diff --git a/locale/ja/LC_MESSAGES/pkgbuilder.mo b/locale/ja/LC_MESSAGES/pkgbuilder.mo index 857ca37..e991f81 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 e34909f..ecd5cbe 100644 --- a/locale/ja/LC_MESSAGES/pkgbuilder.po +++ b/locale/ja/LC_MESSAGES/pkgbuilder.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: 2.1.5.2\n" +"Project-Id-Version: 2.1.5.3\n" "Report-Msgid-Bugs-To: Kwpolska \n" -"POT-Creation-Date: 2012-10-10 20:33+0200\n" +"POT-Creation-Date: 2012-10-12 20:45+0200\n" "PO-Revision-Date: 2012-09-21 20:21+0200\n" "Last-Translator: Colin Woodbury \n" "Language-Team: Colin Woodbury \n" @@ -36,100 +36,100 @@ msgstr "{}：「{}」より要更新" msgid "{}: installed {}" msgstr "{}: 「{}」をインストール済み" -#: pkgbuilder/build.py:72 +#: pkgbuilder/build.py:68 msgid "Installing built packages..." msgstr "作成したパッケージをインストール中・・・" -#: pkgbuilder/build.py:109 +#: pkgbuilder/build.py:96 msgid "The build function reported a proper build." msgstr "パッケージ作成成功。" #. PBxxx. -#: pkgbuilder/build.py:112 +#: pkgbuilder/build.py:99 msgid "makepkg (or someone else) failed and returned {}." msgstr "makepkgなどが「{}」で失敗したようだ。" #. PBSUX. -#: pkgbuilder/build.py:116 +#: pkgbuilder/build.py:103 msgid "PKGBUILDer had a problem." msgstr "PKGBUILDerに問題発生。" #. PBREQ. #. TRANSLATORS: do not translate the word 'requests'. -#: pkgbuilder/build.py:120 +#: pkgbuilder/build.py:107 msgid "" "PKGBUILDer (or the requests library) had problems with fulfilling an HTTP " "request." msgstr "PKGBUILDerか「requests」ライブラリがHTTPリクエストを遂行できなかった。" #. I/O error. -#: pkgbuilder/build.py:124 +#: pkgbuilder/build.py:111 msgid "There was an input/output error." msgstr "入力・出力エラー発生。" #. PBDEP. -#: pkgbuilder/build.py:127 +#: pkgbuilder/build.py:114 msgid "Building more AUR packages is required." msgstr "AURパッケージを更に作成する必要がある。" -#: pkgbuilder/build.py:160 +#: pkgbuilder/build.py:147 msgid "download: HTTP Error {}" msgstr "ダウンロード状態：HTTPエラー {}" -#: pkgbuilder/build.py:163 +#: pkgbuilder/build.py:150 msgid "download: 0 bytes downloaded" msgstr "ダウンロード状態：1バイトもダウンロードされなかった" -#: pkgbuilder/build.py:179 +#: pkgbuilder/build.py:166 msgid "extract: no files extracted" msgstr "抽出状態：ファイルは1つも抽出されなかった" -#: pkgbuilder/build.py:230 +#: pkgbuilder/build.py:217 msgid "depcheck: cannot find {} anywhere" msgstr "従属パッケージ状態：「{}」をどこでも見つからなかった" -#: pkgbuilder/build.py:245 +#: pkgbuilder/build.py:232 msgid "Package {} not found." msgstr "パッケージ「{}」は見つからなかった。" -#: pkgbuilder/build.py:247 +#: pkgbuilder/build.py:234 msgid "Building {}..." msgstr "「{}」を作成中・・・" #. Okay, this package exists, great then. Thanks, user. -#: pkgbuilder/build.py:257 +#: pkgbuilder/build.py:244 msgid "Downloading the tarball..." msgstr "ターボールをダウンロード中・・・" -#: pkgbuilder/build.py:260 +#: pkgbuilder/build.py:247 msgid "{} kB downloaded" msgstr "{} kBをダウンロード済み" -#: pkgbuilder/build.py:262 +#: pkgbuilder/build.py:249 msgid "Extracting..." msgstr "抽出中・・・" -#: pkgbuilder/build.py:263 +#: pkgbuilder/build.py:250 msgid "{} files extracted" msgstr "ファイルを{}個抽出した" -#: pkgbuilder/build.py:268 +#: pkgbuilder/build.py:255 msgid "Checking dependencies..." msgstr "従属パッケージを確認中・・・" -#: pkgbuilder/build.py:271 +#: pkgbuilder/build.py:258 msgid "found in system" msgstr "インストール済み" -#: pkgbuilder/build.py:271 +#: pkgbuilder/build.py:258 msgid "found in repos" msgstr "リポジトリに存在" -#: pkgbuilder/build.py:272 +#: pkgbuilder/build.py:259 msgid "found in the AUR" msgstr "AURに存在" -#: pkgbuilder/build.py:275 +#: pkgbuilder/build.py:262 msgid "none found" msgstr "従属パッケージなし" @@ -225,11 +225,11 @@ msgstr "検索の問いが短すぎる" msgid "Searching for exact match..." msgstr "完全一致を検索中・・・" -#: pkgbuilder/main.py:129 INSTALL.py:65 INSTALL.py:74 INSTALL.py:83 +#: pkgbuilder/main.py:129 INSTALL.py:65 INSTALL.py:74 msgid "not found" msgstr "見つからなかった" -#: pkgbuilder/main.py:181 pkgbuilder/upgrade.py:173 +#: pkgbuilder/main.py:181 pkgbuilder/upgrade.py:174 msgid "Running PKGBUILDer as root can break your system!" msgstr "管理者としてPKGBUILDerを実行すると危険性あり！" @@ -283,29 +283,29 @@ msgstr "「{}」の該当パッケージ：" msgid "Proceed with installation? [Y/n] " msgstr "続行？ [Y/n]" -#: pkgbuilder/utils.py:76 +#: pkgbuilder/utils.py:82 msgid " [installed: {}]" msgstr "[インストール済み：{}]" -#: pkgbuilder/utils.py:78 +#: pkgbuilder/utils.py:84 msgid " [installed]" msgstr "[インストール済み]" -#: pkgbuilder/utils.py:81 +#: pkgbuilder/utils.py:87 msgid "[out of date]" msgstr "[要更新]" -#: pkgbuilder/utils.py:93 +#: pkgbuilder/utils.py:99 msgid "votes" msgstr "投票数" -#: pkgbuilder/utils.py:111 +#: pkgbuilder/utils.py:117 msgid "Package not found." msgstr "パッケージは見つからなかった。" #. TRANSLATORS: space it properly. `yes/no' below are #. for `out of date'. -#: pkgbuilder/utils.py:141 +#: pkgbuilder/utils.py:147 msgid "" "Repository : aur\n" "Category : {cat}\n" @@ -333,11 +333,11 @@ msgstr "" "最近更新日付 : {upd}\n" "説明 : {dsc}\n" -#: pkgbuilder/utils.py:171 +#: pkgbuilder/utils.py:177 msgid "yes" msgstr "要更新" -#: pkgbuilder/utils.py:173 +#: pkgbuilder/utils.py:179 msgid "no" msgstr "最新" @@ -373,11 +373,11 @@ msgstr "" msgid "Performing a dependency check..." msgstr "従属パッケージ確認中・・・" -#: INSTALL.py:62 INSTALL.py:71 INSTALL.py:80 +#: INSTALL.py:62 INSTALL.py:71 msgid "found" msgstr "発見" -#: INSTALL.py:105 +#: INSTALL.py:96 msgid "" "\n" "\n" @@ -399,7 +399,7 @@ msgstr "" "\n" "頑張って！\n" -#: INSTALL.py:123 +#: INSTALL.py:114 msgid "" "Hello!\n" "\n" @@ -417,15 +417,15 @@ msgstr "" "自分でコードをダウンロードしてコンパイルして見て下さい。\n" "\n" -#: INSTALL.py:132 +#: INSTALL.py:123 msgid "Hit Enter/Return to continue. " msgstr "EnterやReturnを押して続行。" -#: INSTALL.py:144 +#: INSTALL.py:135 msgid "Installing missing AUR dependencies..." msgstr "必要な従属AURパッケージをインストール・・・" -#: INSTALL.py:153 +#: INSTALL.py:142 msgid "" "\n" "\n" @@ -453,7 +453,7 @@ msgstr "" "「hash -r」が必要になるかもしれない。pythonのモジュール利用に関しては、\n" "`import pkgbuilder`をいつも通り打てば使える。\n" -#: INSTALL.py:169 +#: INSTALL.py:158 msgid "" "It looks like you want to quit. Okay then, goodbye.\n" "No work has been started yet.\n" @@ -465,7 +465,7 @@ msgstr "" "まだ何もしていないので。\n" "本当に終わりたいなら止めない。違ったら再度このスクリプトを実行！" -#: INSTALL.py:175 +#: INSTALL.py:164 msgid "" "It looks like you want to quit. Okay then, goodbye.\n" "All the files this script was working on are placed in\n" @@ -484,14 +484,14 @@ msgstr "" msgid "usage" msgstr "使い方" -#: localeprovider.py:2 +#: localeprovider.py:3 msgid "positional arguments" msgstr "選択肢" -#: localeprovider.py:2 +#: localeprovider.py:4 msgid "optional arguments" msgstr "副選択肢" -#: localeprovider.py:2 +#: localeprovider.py:5 msgid "show this help message and exit" msgstr "このメッセージを出力して終わる" diff --git a/locale/pl/LC_MESSAGES/pkgbuilder.mo b/locale/pl/LC_MESSAGES/pkgbuilder.mo index 921c631..bdedaf7 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 6ec11be..6b74e8c 100644 --- a/locale/pl/LC_MESSAGES/pkgbuilder.po +++ b/locale/pl/LC_MESSAGES/pkgbuilder.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: 2.1.5.2\n" +"Project-Id-Version: 2.1.5.3\n" "Report-Msgid-Bugs-To: Kwpolska \n" -"POT-Creation-Date: 2012-10-10 20:33+0200\n" +"POT-Creation-Date: 2012-10-12 20:45+0200\n" "PO-Revision-Date: 2012-09-08 12:44+0100\n" "Last-Translator: Kwpolska \n" "Language-Team: Kwpolska \n" @@ -36,29 +36,29 @@ msgstr "{} nieaktualny {}" msgid "{}: installed {}" msgstr "{}: zainstalowany {}" -#: pkgbuilder/build.py:72 +#: pkgbuilder/build.py:68 msgid "Installing built packages..." msgstr "Instalowanie zbudowanych pakietów..." -#: pkgbuilder/build.py:109 +#: pkgbuilder/build.py:96 msgid "The build function reported a proper build." msgstr "Funkcja budowania paczek powiadomiła o prawidłowym zbudowaniu." #. PBxxx. -#: pkgbuilder/build.py:112 +#: pkgbuilder/build.py:99 msgid "makepkg (or someone else) failed and returned {}." msgstr "" "tworzenie pakietu przez makepkg (lub coś innego) nie powiodło się i zwróciło " "{}." #. PBSUX. -#: pkgbuilder/build.py:116 +#: pkgbuilder/build.py:103 msgid "PKGBUILDer had a problem." msgstr "PKGBUILDer miał problem." #. PBREQ. #. TRANSLATORS: do not translate the word 'requests'. -#: pkgbuilder/build.py:120 +#: pkgbuilder/build.py:107 msgid "" "PKGBUILDer (or the requests library) had problems with fulfilling an HTTP " "request." @@ -67,73 +67,73 @@ msgstr "" "HTTP." #. I/O error. -#: pkgbuilder/build.py:124 +#: pkgbuilder/build.py:111 msgid "There was an input/output error." msgstr "Wystąpił błąd wejścia/wyjścia." #. PBDEP. -#: pkgbuilder/build.py:127 +#: pkgbuilder/build.py:114 msgid "Building more AUR packages is required." msgstr "Należy zainstalować więcej pakietów z AUR." -#: pkgbuilder/build.py:160 +#: pkgbuilder/build.py:147 msgid "download: HTTP Error {}" msgstr "download: Błąd HTTP {}" -#: pkgbuilder/build.py:163 +#: pkgbuilder/build.py:150 msgid "download: 0 bytes downloaded" msgstr "download: pobrano 0 bajtów" -#: pkgbuilder/build.py:179 +#: pkgbuilder/build.py:166 msgid "extract: no files extracted" msgstr "extract: wypakowano 0 plików" -#: pkgbuilder/build.py:230 +#: pkgbuilder/build.py:217 msgid "depcheck: cannot find {} anywhere" msgstr "depcheck: nie można nigdzie znaleźć pakietu {}" -#: pkgbuilder/build.py:245 +#: pkgbuilder/build.py:232 msgid "Package {} not found." msgstr "Nie znaleziono pakietu {}." -#: pkgbuilder/build.py:247 +#: pkgbuilder/build.py:234 msgid "Building {}..." msgstr "Budowanie {}..." #. Okay, this package exists, great then. Thanks, user. -#: pkgbuilder/build.py:257 +#: pkgbuilder/build.py:244 msgid "Downloading the tarball..." msgstr "Pobieranie tarballa..." -#: pkgbuilder/build.py:260 +#: pkgbuilder/build.py:247 msgid "{} kB downloaded" msgstr "pobrano {} kB" -#: pkgbuilder/build.py:262 +#: pkgbuilder/build.py:249 msgid "Extracting..." msgstr "Wypakowywanie..." -#: pkgbuilder/build.py:263 +#: pkgbuilder/build.py:250 msgid "{} files extracted" msgstr "wypakowano {} plików" -#: pkgbuilder/build.py:268 +#: pkgbuilder/build.py:255 msgid "Checking dependencies..." msgstr "Sprawdzanie zależności..." -#: pkgbuilder/build.py:271 +#: pkgbuilder/build.py:258 msgid "found in system" msgstr "znaleziono w systemie" -#: pkgbuilder/build.py:271 +#: pkgbuilder/build.py:258 msgid "found in repos" msgstr "znaleziono w repozytoriach" -#: pkgbuilder/build.py:272 +#: pkgbuilder/build.py:259 msgid "found in the AUR" msgstr "znaleziono w AUR" -#: pkgbuilder/build.py:275 +#: pkgbuilder/build.py:262 msgid "none found" msgstr "brak" @@ -229,11 +229,11 @@ msgstr "zapytanie do wyszukiwarki zbyt krótkie, limitacja API" msgid "Searching for exact match..." msgstr "Szukanie dokładnego dopasowania..." -#: pkgbuilder/main.py:129 INSTALL.py:65 INSTALL.py:74 INSTALL.py:83 +#: pkgbuilder/main.py:129 INSTALL.py:65 INSTALL.py:74 msgid "not found" msgstr "nie znaleziono" -#: pkgbuilder/main.py:181 pkgbuilder/upgrade.py:173 +#: pkgbuilder/main.py:181 pkgbuilder/upgrade.py:174 msgid "Running PKGBUILDer as root can break your system!" msgstr "Używanie PKGBUILDera jako root może popsuć twój system!" @@ -287,29 +287,29 @@ msgstr "Cele ({}):" msgid "Proceed with installation? [Y/n] " msgstr "Kontynuować instalację? [Y/n] " -#: pkgbuilder/utils.py:76 +#: pkgbuilder/utils.py:82 msgid " [installed: {}]" msgstr " [zainstalowano: {}]" -#: pkgbuilder/utils.py:78 +#: pkgbuilder/utils.py:84 msgid " [installed]" msgstr " [zainstalowano]" -#: pkgbuilder/utils.py:81 +#: pkgbuilder/utils.py:87 msgid "[out of date]" msgstr "[nieaktualny]" -#: pkgbuilder/utils.py:93 +#: pkgbuilder/utils.py:99 msgid "votes" msgstr "głosów" -#: pkgbuilder/utils.py:111 +#: pkgbuilder/utils.py:117 msgid "Package not found." msgstr "Nie znaleziono pakietu." #. TRANSLATORS: space it properly. `yes/no' below are #. for `out of date'. -#: pkgbuilder/utils.py:141 +#: pkgbuilder/utils.py:147 msgid "" "Repository : aur\n" "Category : {cat}\n" @@ -337,11 +337,11 @@ msgstr "" "Ost. aktualiz. : {upd}\n" "Opis : {dsc}\n" -#: pkgbuilder/utils.py:171 +#: pkgbuilder/utils.py:177 msgid "yes" msgstr "tak" -#: pkgbuilder/utils.py:173 +#: pkgbuilder/utils.py:179 msgid "no" msgstr "nie" @@ -377,11 +377,11 @@ msgstr "" msgid "Performing a dependency check..." msgstr "Sprawdzanie zależności..." -#: INSTALL.py:62 INSTALL.py:71 INSTALL.py:80 +#: INSTALL.py:62 INSTALL.py:71 msgid "found" msgstr "znaleziono" -#: INSTALL.py:105 +#: INSTALL.py:96 msgid "" "\n" "\n" @@ -403,7 +403,7 @@ msgstr "" "\n" "Jeśli się mylę, gratulacje!\n" -#: INSTALL.py:123 +#: INSTALL.py:114 msgid "" "Hello!\n" "\n" @@ -421,15 +421,15 @@ msgstr "" "ręcznie.\n" "\n" -#: INSTALL.py:132 +#: INSTALL.py:123 msgid "Hit Enter/Return to continue. " msgstr "Wciśnij Enter, aby kontynuować." -#: INSTALL.py:144 +#: INSTALL.py:135 msgid "Installing missing AUR dependencies..." msgstr "Instalowanie brakujących zależności z AUR..." -#: INSTALL.py:153 +#: INSTALL.py:142 msgid "" "\n" "\n" @@ -457,7 +457,7 @@ msgstr "" "inne powłoki mogą wymagać innej komendy). Dla użycia jako moduł\n" "Pythona, wpisz `import pkgbuilder` do interpretera.\n" -#: INSTALL.py:169 +#: INSTALL.py:158 msgid "" "It looks like you want to quit. Okay then, goodbye.\n" "No work has been started yet.\n" @@ -471,7 +471,7 @@ msgstr "" "Jeśli to jest to, co chcesz zrobić, proszę bardzo. Jeśli nie,\n" "uruchom ten skrypt jeszcze raz." -#: INSTALL.py:175 +#: INSTALL.py:164 msgid "" "It looks like you want to quit. Okay then, goodbye.\n" "All the files this script was working on are placed in\n" @@ -494,14 +494,14 @@ msgstr "" msgid "usage" msgstr "sposób użycia" -#: localeprovider.py:2 +#: localeprovider.py:3 msgid "positional arguments" msgstr "argumenty" -#: localeprovider.py:2 +#: localeprovider.py:4 msgid "optional arguments" msgstr "argumenty opcjonalne" -#: localeprovider.py:2 +#: localeprovider.py:5 msgid "show this help message and exit" msgstr "pokaż tą wiadomość i wyjdź" diff --git a/localeprovider.py b/localeprovider.py index 23e68a9..8b1eddd 100644 --- a/localeprovider.py +++ b/localeprovider.py @@ -1,2 +1,5 @@ # A module only for gettext locale provision. -translationcheat = _('usage') + _('positional arguments') + _('optional arguments') + _('show this help message and exit') +translationcheat = _('usage') + + _('positional arguments') + + _('optional arguments') + + _('show this help message and exit') diff --git a/messages.pot b/messages.pot index ca215e4..48faf0e 100644 --- a/messages.pot +++ b/messages.pot @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: 2.1.5.2\n" +"Project-Id-Version: 2.1.5.3\n" "Report-Msgid-Bugs-To: Kwpolska \n" -"POT-Creation-Date: 2012-10-10 20:33+0200\n" -"PO-Revision-Date: 2012-10-10 20:33+0200\n" +"POT-Creation-Date: 2012-10-12 20:45+0200\n" +"PO-Revision-Date: 2012-10-12 20:45+0200\n" "Last-Translator: Kwpolska \n" "Language-Team: Kwpolska \n" "Language: en\n" @@ -36,100 +36,100 @@ msgstr "" msgid "{}: installed {}" msgstr "" -#: pkgbuilder/build.py:72 +#: pkgbuilder/build.py:68 msgid "Installing built packages..." msgstr "" -#: pkgbuilder/build.py:109 +#: pkgbuilder/build.py:96 msgid "The build function reported a proper build." msgstr "" #. PBxxx. -#: pkgbuilder/build.py:112 +#: pkgbuilder/build.py:99 msgid "makepkg (or someone else) failed and returned {}." msgstr "" #. PBSUX. -#: pkgbuilder/build.py:116 +#: pkgbuilder/build.py:103 msgid "PKGBUILDer had a problem." msgstr "" #. PBREQ. #. TRANSLATORS: do not translate the word 'requests'. -#: pkgbuilder/build.py:120 +#: pkgbuilder/build.py:107 msgid "" "PKGBUILDer (or the requests library) had problems with fulfilling an HTTP " "request." msgstr "" #. I/O error. -#: pkgbuilder/build.py:124 +#: pkgbuilder/build.py:111 msgid "There was an input/output error." msgstr "" #. PBDEP. -#: pkgbuilder/build.py:127 +#: pkgbuilder/build.py:114 msgid "Building more AUR packages is required." msgstr "" -#: pkgbuilder/build.py:160 +#: pkgbuilder/build.py:147 msgid "download: HTTP Error {}" msgstr "" -#: pkgbuilder/build.py:163 +#: pkgbuilder/build.py:150 msgid "download: 0 bytes downloaded" msgstr "" -#: pkgbuilder/build.py:179 +#: pkgbuilder/build.py:166 msgid "extract: no files extracted" msgstr "" -#: pkgbuilder/build.py:230 +#: pkgbuilder/build.py:217 msgid "depcheck: cannot find {} anywhere" msgstr "" -#: pkgbuilder/build.py:245 +#: pkgbuilder/build.py:232 msgid "Package {} not found." msgstr "" -#: pkgbuilder/build.py:247 +#: pkgbuilder/build.py:234 msgid "Building {}..." msgstr "" #. Okay, this package exists, great then. Thanks, user. -#: pkgbuilder/build.py:257 +#: pkgbuilder/build.py:244 msgid "Downloading the tarball..." msgstr "" -#: pkgbuilder/build.py:260 +#: pkgbuilder/build.py:247 msgid "{} kB downloaded" msgstr "" -#: pkgbuilder/build.py:262 +#: pkgbuilder/build.py:249 msgid "Extracting..." msgstr "" -#: pkgbuilder/build.py:263 +#: pkgbuilder/build.py:250 msgid "{} files extracted" msgstr "" -#: pkgbuilder/build.py:268 +#: pkgbuilder/build.py:255 msgid "Checking dependencies..." msgstr "" -#: pkgbuilder/build.py:271 +#: pkgbuilder/build.py:258 msgid "found in system" msgstr "" -#: pkgbuilder/build.py:271 +#: pkgbuilder/build.py:258 msgid "found in repos" msgstr "" -#: pkgbuilder/build.py:272 +#: pkgbuilder/build.py:259 msgid "found in the AUR" msgstr "" -#: pkgbuilder/build.py:275 +#: pkgbuilder/build.py:262 msgid "none found" msgstr "" @@ -225,11 +225,11 @@ msgstr "" msgid "Searching for exact match..." msgstr "" -#: pkgbuilder/main.py:129 INSTALL.py:65 INSTALL.py:74 INSTALL.py:83 +#: pkgbuilder/main.py:129 INSTALL.py:65 INSTALL.py:74 msgid "not found" msgstr "" -#: pkgbuilder/main.py:181 pkgbuilder/upgrade.py:173 +#: pkgbuilder/main.py:181 pkgbuilder/upgrade.py:174 msgid "Running PKGBUILDer as root can break your system!" msgstr "" @@ -283,29 +283,29 @@ msgstr "" msgid "Proceed with installation? [Y/n] " msgstr "" -#: pkgbuilder/utils.py:76 +#: pkgbuilder/utils.py:82 msgid " [installed: {}]" msgstr "" -#: pkgbuilder/utils.py:78 +#: pkgbuilder/utils.py:84 msgid " [installed]" msgstr "" -#: pkgbuilder/utils.py:81 +#: pkgbuilder/utils.py:87 msgid "[out of date]" msgstr "" -#: pkgbuilder/utils.py:93 +#: pkgbuilder/utils.py:99 msgid "votes" msgstr "" -#: pkgbuilder/utils.py:111 +#: pkgbuilder/utils.py:117 msgid "Package not found." msgstr "" #. TRANSLATORS: space it properly. `yes/no' below are #. for `out of date'. -#: pkgbuilder/utils.py:141 +#: pkgbuilder/utils.py:147 msgid "" "Repository : aur\n" "Category : {cat}\n" @@ -321,11 +321,11 @@ msgid "" "Description : {dsc}\n" msgstr "" -#: pkgbuilder/utils.py:171 +#: pkgbuilder/utils.py:177 msgid "yes" msgstr "" -#: pkgbuilder/utils.py:173 +#: pkgbuilder/utils.py:179 msgid "no" msgstr "" @@ -352,11 +352,11 @@ msgstr "" msgid "Performing a dependency check..." msgstr "" -#: INSTALL.py:62 INSTALL.py:71 INSTALL.py:80 +#: INSTALL.py:62 INSTALL.py:71 msgid "found" msgstr "" -#: INSTALL.py:105 +#: INSTALL.py:96 msgid "" "\n" "\n" @@ -369,7 +369,7 @@ msgid "" "If I am wrong, though, congratulations!\n" msgstr "" -#: INSTALL.py:123 +#: INSTALL.py:114 msgid "" "Hello!\n" "\n" @@ -380,15 +380,15 @@ msgid "" "\n" msgstr "" -#: INSTALL.py:132 +#: INSTALL.py:123 msgid "Hit Enter/Return to continue. " msgstr "" -#: INSTALL.py:144 +#: INSTALL.py:135 msgid "Installing missing AUR dependencies..." msgstr "" -#: INSTALL.py:153 +#: INSTALL.py:142 msgid "" "\n" "\n" @@ -404,7 +404,7 @@ msgid "" "python module usage, type `import pkgbuilder` into the python prompt.\n" msgstr "" -#: INSTALL.py:169 +#: INSTALL.py:158 msgid "" "It looks like you want to quit. Okay then, goodbye.\n" "No work has been started yet.\n" @@ -413,7 +413,7 @@ msgid "" "script again." msgstr "" -#: INSTALL.py:175 +#: INSTALL.py:164 msgid "" "It looks like you want to quit. Okay then, goodbye.\n" "All the files this script was working on are placed in\n" @@ -429,14 +429,14 @@ msgstr "" msgid "usage" msgstr "" -#: localeprovider.py:2 +#: localeprovider.py:3 msgid "positional arguments" msgstr "" -#: localeprovider.py:2 +#: localeprovider.py:4 msgid "optional arguments" msgstr "" -#: localeprovider.py:2 +#: localeprovider.py:5 msgid "show this help message and exit" msgstr "" diff --git a/pkgbuilder/__init__.py b/pkgbuilder/__init__.py index 57f94f4..cbdba54 100755 --- a/pkgbuilder/__init__.py +++ b/pkgbuilder/__init__.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 # -*- encoding: utf-8 -*- -# PKGBUILDer v2.1.5.2 +# PKGBUILDer v2.1.5.3 # An AUR helper (and library) in Python 3. # Copyright © 2011-2012, Kwpolska. # All rights reserved. @@ -44,7 +44,7 @@ """ __title__ = 'PKGBUILDer' -__version__ = '2.1.5.2' +__version__ = '2.1.5.3' __author__ = 'Kwpolska' __license__ = '3-clause BSD' __docformat__ = 'restructuredtext en' diff --git a/pkgbuilder/aur.py b/pkgbuilder/aur.py index dee2012..d86c91d 100755 --- a/pkgbuilder/aur.py +++ b/pkgbuilder/aur.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 # -*- encoding: utf-8 -*- -# PKGBUILDer v2.1.5.2 +# PKGBUILDer v2.1.5.3 # An AUR helper (and library) in Python 3. # Copyright © 2011-2012, Kwpolska. # See /LICENSE for licensing information. diff --git a/pkgbuilder/build.py b/pkgbuilder/build.py index 3a1d3cd..2fa1af6 100755 --- a/pkgbuilder/build.py +++ b/pkgbuilder/build.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 # -*- encoding: utf-8 -*- -# PKGBUILDer v2.1.5.2 +# PKGBUILDer v2.1.5.3 # An AUR helper (and library) in Python 3. # Copyright © 2011-2012, Kwpolska. # See /LICENSE for licensing information. @@ -63,29 +63,16 @@ def validate(self, pkgnames): DS.fancy_msg2(_('{}: installed {}').format(pkgname, pkg.version)) - def install(self, pkgpaths): - """ - Install packages through ``pacman -U``. Warning:: - - pkgpaths = [packages, sigfiles-if-any-or-None] - """ + def install(self, pkgpaths, sigpaths=[]): + """Install packages through ``pacman -U``.""" DS.fancy_msg(_('Installing built packages...')) - if pkgpaths[0]: - pkgs = pkgpaths[0] - else: - pkgs = [] - - if pkgpaths[1]: - sigs = pkgpaths[1] - else: - sigs = [] - - DS.log.info('pkgs={}; sigs={}'.format(pkgs, sigs)) - DS.log.debug('cp {} {} /var/cache/pacman/pkg/'.format(pkgs, sigs)) - DS.sudo('cp', pkgs + sigs, '/var/cache/pacman/pkg/') - DS.log.debug('$PACMAN -U {}'.format(pkgs)) - DS.sudo(DS.paccommand, '-U', pkgs) + DS.log.info('pkgs={}; sigs={}'.format(pkgpaths, sigpaths)) + DS.log.debug('cp {} {} /var/cache/pacman/pkg/'.format(pkgpaths, + sigpaths)) + DS.sudo('cp', pkgpaths + sigpaths, '/var/cache/pacman/pkg/') + DS.log.debug('$PACMAN -U {}'.format(pkgpaths)) + DS.sudo(DS.paccommand, '-U', pkgpaths) def auto_build(self, pkgname, performdepcheck=True, pkginstall=True): diff --git a/pkgbuilder/main.py b/pkgbuilder/main.py index 5f44ccf..54fea7e 100755 --- a/pkgbuilder/main.py +++ b/pkgbuilder/main.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 # -*- encoding: utf-8 -*- -# PKGBUILDer v2.1.5.2 +# PKGBUILDer v2.1.5.3 # An AUR helper (and library) in Python 3. # Copyright © 2011-2012, Kwpolska. # See /LICENSE for licensing information. @@ -183,13 +183,16 @@ def main(source='AUTO', quit=True): DS.log.info('Starting build...') toinstall = [] + sigs = [] for pkgname in args.pkgs: DS.log.info('Building {}'.format(pkgname)) out = build.auto_build(pkgname, DS.depcheck, DS.pkginst) if out: - toinstall += out + toinstall += out[0] + sigs += out[1] + if toinstall: - build.install(toinstall) + build.install(toinstall, sigs) if DS.validate: build.validate(args.pkgs) diff --git a/pkgbuilder/pbds.py b/pkgbuilder/pbds.py index 7d74db6..6006c83 100755 --- a/pkgbuilder/pbds.py +++ b/pkgbuilder/pbds.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 # -*- encoding: utf-8 -*- -# PKGBUILDer v2.1.5.2 +# PKGBUILDer v2.1.5.3 # An AUR helper (and library) in Python 3. # Copyright © 2011-2012, Kwpolska. # See /LICENSE for licensing information. diff --git a/pkgbuilder/upgrade.py b/pkgbuilder/upgrade.py index 67259c5..8c18c57 100755 --- a/pkgbuilder/upgrade.py +++ b/pkgbuilder/upgrade.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 # -*- encoding: utf-8 -*- -# PKGBUILDer v2.1.5.2 +# PKGBUILDer v2.1.5.3 # An AUR helper (and library) in Python 3. # Copyright © 2011-2012, Kwpolska. # See /LICENSE for licensing information. @@ -167,6 +167,7 @@ def auto_upgrade(self, downgrade=False, vcsup=False): return 0 toinstall = [] + sigs = [] if DS.uid == 0: DS.log.warning('Running as root! (UID={})'.format(DS.uid)) @@ -177,10 +178,11 @@ def auto_upgrade(self, downgrade=False, vcsup=False): out = self.build.auto_build(pkgname, DS.depcheck, DS.pkginst) if out: - toinstall += out + toinstall += out[0] + sigs += out[1] if toinstall: - self.build.install(toinstall) + self.build.install(toinstall, sigs) if DS.validate: self.build.validate(upgnames) diff --git a/pkgbuilder/utils.py b/pkgbuilder/utils.py index 9d4dfc6..dab9b54 100755 --- a/pkgbuilder/utils.py +++ b/pkgbuilder/utils.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 # -*- encoding: utf-8 -*- -# PKGBUILDer v2.1.5.2 +# PKGBUILDer v2.1.5.3 # An AUR helper (and library) in Python 3. # Copyright © 2011-2012, Kwpolska. # See /LICENSE for licensing information. @@ -21,6 +21,7 @@ import pyalpm import pycman import os +import subprocess import textwrap import datetime @@ -61,9 +62,14 @@ def print_package_search(self, pkg, use_categories=True, Outputs/returns a package representation, which is close to the output of ``pacman -Ss``. """ - size = os.popen('stty size', 'r') - termwidth = int(size.read().split()[1]) - size.close() + size = subprocess.Popen(['stty', 'size'], stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + try: + termwidth = int(size.stdout.read().split()[1]) + except IndexError: + termwidth = 9001 # Auto-wrap by terminal. A reference to an old + # meme and a cheat, too. Sorry. + size.stdout.close() H = pycman.config.init_with_config('/etc/pacman.conf') localdb = H.get_localdb() lpkg = localdb.get_pkg(pkg['Name']) diff --git a/pkgbuilder/wrapper.py b/pkgbuilder/wrapper.py index 48dea73..2b18c09 100755 --- a/pkgbuilder/wrapper.py +++ b/pkgbuilder/wrapper.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 # -*- encoding: utf-8 -*- # PBWrapper v0.1.4 -# PKGBUILDer v2.1.5.2 +# PKGBUILDer v2.1.5.3 # An AUR helper (and library) in Python 3. # Copyright © 2011-2012, Kwpolska. # See /LICENSE for licensing information. diff --git a/setup.py b/setup.py index 99937de..1ca9e85 100755 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ from distutils.core import setup setup(name='pkgbuilder', - version='2.1.5.2', + version='2.1.5.3', description='An AUR helper (and library) in Python 3.', author='Kwpolska', author_email='kwpolska@kwpolska.tk',