From 93db478149e84dde9831f6e98631ab400925d055 Mon Sep 17 00:00:00 2001 From: Kwpolska Date: Sat, 5 Nov 2011 20:56:33 +0100 Subject: [PATCH] v2.1.2.9: -Syu more pacmanish Signed-off-by: Kwpolska --- PKGBUILD | 4 +- README.rst | 4 +- Rakefile | 2 +- dist/pkgbuilder-2.1.2.9.tar.gz | Bin 0 -> 26351 bytes docs/LICENSE.rst | 4 +- docs/README.rst | 4 +- docs/classes.rst | 8 +- docs/conf.py | 2 +- docs/messagecodes.rst | 4 +- docs/pkgbuilder.8.gz | Bin 1304 -> 1306 bytes docs/pkgbuilder.rst | 4 +- locale/en/LC_MESSAGES/pkgbuilder.po | 124 ++++++++++++++------------ messages.pot => locale/pkgbuilder.pot | 2 +- locale/pl/LC_MESSAGES/pkgbuilder.po | 124 ++++++++++++++------------ pkgbuilder.py | 49 ++++++---- scripts/pkgbuilder | 2 +- setup.py | 2 +- 17 files changed, 194 insertions(+), 145 deletions(-) create mode 100644 dist/pkgbuilder-2.1.2.9.tar.gz rename messages.pot => locale/pkgbuilder.pot (99%) diff --git a/PKGBUILD b/PKGBUILD index be5a39f..b19010d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Kwpolska pkgname=pkgbuilder -pkgver=2.1.2.8 +pkgver=2.1.2.9 pkgrel=1 pkgdesc="A basic Python AUR helper/library." arch=('any') @@ -9,7 +9,7 @@ license=('BSD') depends=('python' 'pyalpm>=0.5.1-1' 'python-pyparsing' 'pacman>=4.0.0-1') options=(!emptydirs) source=("http://pypi.python.org/packages/source/p/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('2678acc4987afd76debcc96dc1ccd5a4') +md5sums=('43e659304fd7f38e375004a358cec11e') package() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/README.rst b/README.rst index 2dac730..f500af4 100644 --- a/README.rst +++ b/README.rst @@ -3,8 +3,8 @@ README for PKGBUILDer ===================== :Info: This is the README file for PKGBUILDer. :Author: Kwpolska -:Date: 2011-11-02 -:Version: 2.1.2.8 +:Date: 2011-11-05 +:Version: 2.1.2.9 PKGBUILDer. A Python AUR helper/library. ========================================= diff --git a/Rakefile b/Rakefile index a3b6c9b..1fc2f4d 100755 --- a/Rakefile +++ b/Rakefile @@ -101,9 +101,9 @@ task :git, :ver, :msg do |t, args| commitmsg = args[:msg].chomp end + sh "rm -rfv __pycache__/ build/" sh "git add *" sh "git commit -asm 'v#{version}: #{commitmsg}'" - sh "rm -rfv __pycache__/ build/" sh "git tag -a 'v#{version}' -m 'Version #{version}'" sh "git push --tags" end diff --git a/dist/pkgbuilder-2.1.2.9.tar.gz b/dist/pkgbuilder-2.1.2.9.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..26a27d36fe6e140adff319647e2c48387337a777 GIT binary patch literal 26351 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 C`#T%} literal 0 HcmV?d00001 diff --git a/docs/LICENSE.rst b/docs/LICENSE.rst index e41edf3..1dd945d 100644 --- a/docs/LICENSE.rst +++ b/docs/LICENSE.rst @@ -3,8 +3,8 @@ Appendix B. License for PKGBUILDer ================================== :Info: This is an appendix to the PKGBUILDer documentation. :Author: Kwpolska -:Date: 2011-11-02 -:Version: 2.1.2.8 +:Date: 2011-11-05 +:Version: 2.1.2.9 Copyright (C) 2011, Kwpolska All rights reserved. diff --git a/docs/README.rst b/docs/README.rst index 2dac730..f500af4 100644 --- a/docs/README.rst +++ b/docs/README.rst @@ -3,8 +3,8 @@ README for PKGBUILDer ===================== :Info: This is the README file for PKGBUILDer. :Author: Kwpolska -:Date: 2011-11-02 -:Version: 2.1.2.8 +:Date: 2011-11-05 +:Version: 2.1.2.9 PKGBUILDer. A Python AUR helper/library. ========================================= diff --git a/docs/classes.rst b/docs/classes.rst index 3e071fe..e1cc715 100644 --- a/docs/classes.rst +++ b/docs/classes.rst @@ -4,8 +4,8 @@ Classes in PKGBUILDer :Author: Kwpolska :Copyright: See Appendix B. -:Date: 2011-11-02 -:Version: 2.1.2.8 +:Date: 2011-11-05 +:Version: 2.1.2.9 .. index:: classes .. module:: PKGBUILDer @@ -386,9 +386,11 @@ Upgrades packages. Simillar to :meth:`Build.auto_build()`. :Arguments: none. :Input: none. :Output: none. -:Returns: foreign packages. +:Returns: foreign packages (format: [['pkgname', 'pkgver']] :Exceptions: none. :Message codes: none. +:Former data: + 2.1.2.8 return format: ['pkgname'] Gathers a list of all foreign packages. diff --git a/docs/conf.py b/docs/conf.py index 8946926..6776927 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -50,7 +50,7 @@ # The short X.Y version. version = '2.1' # The full version, including alpha/beta/rc tags. -release = '2.1.2.8' +release = '2.1.2.9' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/messagecodes.rst b/docs/messagecodes.rst index 8fa3de8..27e2112 100644 --- a/docs/messagecodes.rst +++ b/docs/messagecodes.rst @@ -3,8 +3,8 @@ Appendix A. PKGBUILDer message numbers list =========================================== :Info: This is an appendix to the PKGBUILDer documentation. :Author: Kwpolska -:Date: 2011-11-02 -:Version: 2.1.2.8 +:Date: 2011-11-05 +:Version: 2.1.2.9 In order to help debugging, messages are numbered. Each message number has four digits: the first one is the diff --git a/docs/pkgbuilder.8.gz b/docs/pkgbuilder.8.gz index 347bf7d0144f02a97914ff77e9b3966b43d85282..9e8f60dd988205a477defa0b7c5a47a76e9761d6 100644 GIT binary patch delta 841 zcmV-P1GfB_3YrRkABzYG+my9V00VGqXJU0}Y-D9}E;s;{R_{;qHW2>qzv6^83A8q) zNR!?ngw{d_)eCLalx>Le!A;!8Yhq`%L+Sqd-PsLop=?4RNbK|dc%J9ZiKa(z&lQw> zAz&etFx-h0=0+D_MC?qJIAKIO5w9*{_%peM(f6C~L;vo7x;KVzaCCOsZa4Aw^yedd ziQ3Uw^b0=KM#4bBRmJlo7R9$P=-l_%&fc^Ms)b*UZI>$l;VWQ_-f~ zu_(21_uMR`V$pNghfg0+`831#P#ieBLG-8gC&9IK=bJR)VNmA@ zRx~d${h!SL6N;Xwn}JyptVmOAFXporjZ&0Zswo zlh^?-7!k%&2Gs7S4cMs}9lXdCeHS{da*C1h_mdw2D*=|1O9D+2GLbCpu2-na6o)Sr zR0k#c=5Ld#0$KqplLZ4i3s-+!pVSKbZ+Tq>lS>05ATK!gA)s9Vsmb!P-(tCuamk1CJ+7Su6K~J?VN_x z=yIlCS(EPrA%A0}H}4Jf;c7@+w#!sd?6kRavos(2pT$^LyMy7a@fE=~r!L*lPHAJd z#e2-+UJp8V@o;mWbpzkW-%jd2CVnwwSn*bmy7Ke+MOx`RLJRzF@Y?`za$g{U(;qYE zN_*aF;Z9b~BGgUm`>NErUGmo6m3hf1Z_5xGiZdUS|}ZF1)%Ro?Fc<$`wT|bL!pTbh+{HYyA+pC7lh)b{;0T z!!fJFz{Mf+OK*BL96gTvH@6eKEKpb2Au5%x(2e|8%+1@!^lS~OPAVr+GRTJi)Lt2h TQ#V-RHwx~*538SjhYJ7zt;nFb delta 839 zcmV-N1GxN}3YZFiABzYGnsKpC00VGqXJU0}Y-D9}E;s;{R&P)HHV}UAPjNz<1X`O? zULl0gTIitqL0dIt8=|~$6Swi2*qQB6x=+75yP++VO$Y>ueZD`>^V~Vn^aviff|4%; zEQAtDE!h33rA@2kgs|_SYI5l`|{)qYqHOqr!NN<+lLmBZOM{%Fz+9}c{e9c@bs*jb&&lZydP0p*k0 z0WTO8#!?2JeR5Ob+42IWh;Xd3uj_;Zlq9YzP_lFyaOf=!|1+ukg@HYhScbC zrr%hT@dF`$bEJ3g4fNq^NL;qdR8Z`+xpT8LANya$SXaA);l1${!8WHZ-Ox^HW46Ud z%;H`TI`{E#bDwns-^b@CbsrPI7&5GQt0!Ig`TQ!abRMAv{x|q-064iXk-+KCnRBJR zXti)Bt7Z}EruAc0>fA1QYwyauVw5*&#*gLDdELi<+i<~ls|AjvjEAvh{O1SG3?9PX zN_SVy{Ff*@{!ZMMv=*;33QreaT@cT$W)|g&qLw-JZg9HXc=)w`h}@FShGaXBle^)V z)nVZBkolE2y&jI9#{Jv730@YcE9?-J$~Wjn{wwD8{bPEzhEyk&lPDQv!+&b8jKrxM REb$u(_g~uiRZxcu007~9o>c$< diff --git a/docs/pkgbuilder.rst b/docs/pkgbuilder.rst index 9a75bf2..db457f3 100644 --- a/docs/pkgbuilder.rst +++ b/docs/pkgbuilder.rst @@ -4,8 +4,8 @@ PKGBUILDer :Author: Kwpolska :Copyright: See Appendix B. -:Date: 2011-11-02 -:Version: 2.1.2.8 +:Date: 2011-11-05 +:Version: 2.1.2.9 :Manual section: 8 :Manual group: PKGBUILDer manual diff --git a/locale/en/LC_MESSAGES/pkgbuilder.po b/locale/en/LC_MESSAGES/pkgbuilder.po index 0553de7..de7d191 100644 --- a/locale/en/LC_MESSAGES/pkgbuilder.po +++ b/locale/en/LC_MESSAGES/pkgbuilder.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: 2.1.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-29 19:15+0100\n" -"PO-Revision-Date: 2011-10-29 19:15+0100\n" +"POT-Creation-Date: 2011-11-05 20:48+0100\n" +"PO-Revision-Date: 2011-11-05 20:54+0100\n" "Last-Translator: Kwpolska \n" "Language-Team: \n" "Language: \n" @@ -31,177 +31,191 @@ msgstr "WARNING:" msgid "ERROR:" msgstr "ERROR:" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:369 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:383 msgid " [installed: {0}]" msgstr " [installed: {0}]" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:371 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:385 msgid " [installed]" msgstr " [installed]" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:374 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:388 msgid "[out of date]" msgstr "[out of date]" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:380 -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:383 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:394 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:397 msgid "votes" msgstr "votes" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:424 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:438 msgid "The build function reported a proper build." msgstr "The build function reported a proper build." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:433 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:447 msgid "[ERR3451] validation: NOT installed" msgstr "[ERR3451] validation: NOT installed" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:437 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:451 msgid "[ERR3452] validation: outdated {0}" msgstr "[ERR3452] validation: outdated {0}" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:440 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:454 msgid "[INF3450] validation: installed {0}" msgstr "[INF3450] validation: installed {0}" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:444 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:458 msgid "[ERR3301] makepkg returned 1." msgstr "[ERR3301] makepkg returned 1." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:449 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:463 msgid "[ERR3401] Building more AUR packages is required." msgstr "[ERR3401] Building more AUR packages is required." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:479 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:493 msgid "[ERR3101] download: 0 bytes downloaded" msgstr "[ERR3101] download: 0 bytes downloaded" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:496 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:510 msgid "[ERR3151] extract: no files extracted" msgstr "[ERR3151] extract: no files extracted" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:584 -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:646 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:600 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:662 msgid "[ERR3201] depcheck: cannot find {0} anywhere" msgstr "[ERR3201] depcheck: cannot find {0} anywhere" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:612 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:628 msgid "[ERR3001] Package {0} not found." msgstr "[ERR3001] Package {0} not found." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:615 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:631 msgid "Building {0}..." msgstr "Building {0}..." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:623 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:639 msgid "Downloading the tarball..." msgstr "Downloading the tarball..." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:626 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:642 msgid "{0} kB downloaded" msgstr "{0} kB downloaded" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:628 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:644 msgid "Extracting..." msgstr "Extracting..." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:629 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:645 msgid "{0} files extracted" msgstr "{0} files extracted" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:633 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:649 msgid "Checking dependencies..." msgstr "Checking dependencies..." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:638 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:654 msgid "found in system" msgstr "found in system" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:638 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:654 msgid "found in repos" msgstr "found in repos" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:639 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:655 msgid "found in the AUR" msgstr "found in the AUR" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:642 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:658 msgid "none found" msgstr "none found" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:656 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:672 msgid "[ERR3202] depcheck: UnicodeDecodeError. The PKGBUILD cannot be read. There are invalid UTF-8 characters (eg. in the Maintainer field.) Error message: {0}" msgstr "[ERR3202] depcheck: UnicodeDecodeError. The PKGBUILD cannot be read. There are invalid UTF-8 characters (eg. in the Maintainer field.) Error message: {0}" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:755 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:774 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:776 msgid "Gathering data about packages..." msgstr "Gathering data about packages..." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:761 -msgid "{0} upgradeable packages found:" -msgstr "{0} upgradeable packages found:" +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:785 +msgid ":: Starting full AUR upgrade..." +msgstr ":: Starting full AUR upgrade..." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:763 -msgid "there is nothing to do" +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:787 +msgid " there is nothing to do" msgstr "there is nothing to do" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:767 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:790 +msgid "Targets ({0}): " +msgstr "Targets ({0}): " + +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:791 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:801 msgid "Proceed with installation? [Y/n] " msgstr "Proceed with installation? [Y/n] " -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:791 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:794 +msgid "{0} upgradeable packages found:" +msgstr "{0} upgradeable packages found:" + +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:796 +msgid "there is nothing to do" +msgstr "there is nothing to do" + +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:825 msgid "A python3 AUR helper (sort of.) Wrapper-friendly (pacman-like output.)" msgstr "A python3 AUR helper (sort of.) Wrapper-friendly (pacman-like output.)" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:792 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:826 msgid "You can use pacman syntax if you want to." msgstr "You can use pacman syntax if you want to." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:798 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:832 msgid "packages to build" msgstr "packages to build" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:803 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:837 msgid "don't use colors in output" msgstr "don't use colors in output" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:806 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:840 msgid "don't check dependencies (may break makepkg)" msgstr "don't check dependencies (may break makepkg)" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:809 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:843 msgid "build packages but do not install/upgrade anything" msgstr "build packages but do not install/upgrade anything" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:812 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:846 msgid "don't check if packages were installed after build" msgstr "don't check if packages were installed after build" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:816 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:850 msgid "pacman syntax compatiblity" msgstr "pacman syntax compatiblity" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:818 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:852 msgid "pacman syntax compatiblity" msgstr "pacman syntax compatiblity" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:822 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:856 msgid "view package information" msgstr "view package information" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:824 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:858 msgid "search the AUR for matching strings" msgstr "search the AUR for matching strings" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:828 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:862 msgid "upgrade installed AUR packages" msgstr "upgrade installed AUR packages" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:849 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:883 msgid "Package {0} not found." msgstr "Package {0} not found." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:853 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:887 msgid "" "Category : {cat}\n" "Name : {nme}\n" @@ -227,23 +241,23 @@ msgstr "" "First Submitted: {fsb}\n" "Description : {dsc}\n" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:871 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:905 msgid "yes" msgstr "yes" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:872 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:906 msgid "no" msgstr "no" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:887 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:921 msgid "[ERR5002] search string too short, API limitation" msgstr "[ERR5002] search string too short, API limitation" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:889 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:923 msgid "Searching for exact match..." msgstr "Searching for exact match..." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:892 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:926 msgid "not found" msgstr "not found" diff --git a/messages.pot b/locale/pkgbuilder.pot similarity index 99% rename from messages.pot rename to locale/pkgbuilder.pot index 8cae9c7..8b75951 100644 --- a/messages.pot +++ b/locale/pkgbuilder.pot @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: 2.1.1.4\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-10-29 19:14+0100\n" -"PO-Revision-Date: 2011-10-29 19:14+0100\n" +"PO-Revision-Date: 2011-11-05 20:48+0100\n" "Last-Translator: Kwpolska \n" "Language-Team: \n" "Language: \n" diff --git a/locale/pl/LC_MESSAGES/pkgbuilder.po b/locale/pl/LC_MESSAGES/pkgbuilder.po index e6a511a..97f2db2 100644 --- a/locale/pl/LC_MESSAGES/pkgbuilder.po +++ b/locale/pl/LC_MESSAGES/pkgbuilder.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: 2.1.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-29 19:14+0100\n" -"PO-Revision-Date: 2011-10-29 19:15+0100\n" +"POT-Creation-Date: 2011-11-05 20:48+0100\n" +"PO-Revision-Date: 2011-11-05 20:54+0100\n" "Last-Translator: Kwpolska \n" "Language-Team: \n" "Language: \n" @@ -31,177 +31,191 @@ msgstr "UWAGA:" msgid "ERROR:" msgstr "BŁĄD:" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:369 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:383 msgid " [installed: {0}]" msgstr " [zainstalowano: {0}]" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:371 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:385 msgid " [installed]" msgstr " [zainstalowano]" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:374 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:388 msgid "[out of date]" msgstr "[nieaktualny]" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:380 -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:383 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:394 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:397 msgid "votes" msgstr "głosów" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:424 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:438 msgid "The build function reported a proper build." msgstr "Funkcja budowania paczek powiadomiła o prawidłowym zbudowaniu." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:433 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:447 msgid "[ERR3451] validation: NOT installed" msgstr "[ERR3451] walidacja: NIE zainstalowano" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:437 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:451 msgid "[ERR3452] validation: outdated {0}" msgstr "[ERR3452] walidacja: nieaktualne {0}" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:440 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:454 msgid "[INF3450] validation: installed {0}" msgstr "[INF3450] walidacja: zainstalowane {0}" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:444 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:458 msgid "[ERR3301] makepkg returned 1." msgstr "[ERR3301] makepkg zwrócił 1." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:449 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:463 msgid "[ERR3401] Building more AUR packages is required." msgstr "[ERR3401] Należy zainstalować więcej pakietów z AUR." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:479 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:493 msgid "[ERR3101] download: 0 bytes downloaded" msgstr "[ERR3101] download: ściągnięto 0 bajtów" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:496 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:510 msgid "[ERR3151] extract: no files extracted" msgstr "[ERR3151] extract: wypakowano 0 plików" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:584 -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:646 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:600 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:662 msgid "[ERR3201] depcheck: cannot find {0} anywhere" msgstr "[ERR3201] depcheck: nie można nigdzie znaleźć pakietu {0}" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:612 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:628 msgid "[ERR3001] Package {0} not found." msgstr "[ERR3001] Nie znaleziono pakietu {0}." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:615 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:631 msgid "Building {0}..." msgstr "Budowanie {0}..." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:623 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:639 msgid "Downloading the tarball..." msgstr "Ściąganie paczki..." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:626 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:642 msgid "{0} kB downloaded" msgstr "ściągnięto {0} kB" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:628 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:644 msgid "Extracting..." msgstr "Wypakowywanie..." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:629 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:645 msgid "{0} files extracted" msgstr "wypakowano {0} plików" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:633 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:649 msgid "Checking dependencies..." msgstr "Sprawdzanie zależności..." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:638 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:654 msgid "found in system" msgstr "znaleziono w systemie" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:638 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:654 msgid "found in repos" msgstr "znaleziono w repozytoriach" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:639 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:655 msgid "found in the AUR" msgstr "znaleziono w AUR" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:642 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:658 msgid "none found" msgstr "brak" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:656 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:672 msgid "[ERR3202] depcheck: UnicodeDecodeError. The PKGBUILD cannot be read. There are invalid UTF-8 characters (eg. in the Maintainer field.) Error message: {0}" msgstr "[ERR3202] depcheck: UnicodeDecodeError. Nie można przeczytać PKGBUILD. Znajdują się w nim nieprawidłowe znaki UTF-8. Treść błędu: {0}" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:755 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:774 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:776 msgid "Gathering data about packages..." msgstr "Zbieranie informacji o pakietach..." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:761 -msgid "{0} upgradeable packages found:" -msgstr "Znaleziono {0} pakietów do aktualizacji:" +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:785 +msgid ":: Starting full AUR upgrade..." +msgstr ":: Rozpoczynanie pełnej aktualizacji pakietów z AUR..." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:763 -msgid "there is nothing to do" +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:787 +msgid " there is nothing to do" msgstr "nie ma nic do zrobienia" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:767 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:790 +msgid "Targets ({0}): " +msgstr "Cele ({0}):" + +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:791 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:801 msgid "Proceed with installation? [Y/n] " msgstr "Kontynuować instalację? [Y/n] " -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:791 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:794 +msgid "{0} upgradeable packages found:" +msgstr "Znaleziono {0} pakietów do aktualizacji:" + +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:796 +msgid "there is nothing to do" +msgstr "nie ma nic do zrobienia" + +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:825 msgid "A python3 AUR helper (sort of.) Wrapper-friendly (pacman-like output.)" msgstr "AUR helper w pythonie 3. Przyjazny dla wrapperów." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:792 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:826 msgid "You can use pacman syntax if you want to." msgstr "Jeśli chcesz, możesz używać składni pacmana." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:798 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:832 msgid "packages to build" msgstr "pakiety do zbudowania" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:803 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:837 msgid "don't use colors in output" msgstr "nie używa kolorów na wyjściu" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:806 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:840 msgid "don't check dependencies (may break makepkg)" msgstr "nie sprawdza zależności (może popsuć makepkg)" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:809 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:843 msgid "build packages but do not install/upgrade anything" msgstr "buduje jedynie pakiety bez instalacji/uaktualniania czegokolwiek" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:812 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:846 msgid "don't check if packages were installed after build" msgstr "nie sprawdza czy pakiety zostały zainstalowane po zbudowaniu" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:816 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:850 msgid "pacman syntax compatiblity" msgstr "kompatybilność ze składnią pacmana" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:818 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:852 msgid "pacman syntax compatiblity" msgstr "kompatybilność ze składnią pacmana" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:822 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:856 msgid "view package information" msgstr "wyświetla informację o pakiecie" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:824 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:858 msgid "search the AUR for matching strings" msgstr "przeszukuje AUR według pasujących ciągów" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:828 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:862 msgid "upgrade installed AUR packages" msgstr "uaktualnia zainstalowane pakiety" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:849 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:883 msgid "Package {0} not found." msgstr "Nie znaleziono pakietu {0}." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:853 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:887 msgid "" "Category : {cat}\n" "Name : {nme}\n" @@ -227,23 +241,23 @@ msgstr "" "Wysłany : {fsb}\n" "Opis : {dsc}\n" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:871 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:905 msgid "yes" msgstr "tak" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:872 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:906 msgid "no" msgstr "nie" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:887 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:921 msgid "[ERR5002] search string too short, API limitation" msgstr "[ERR5002] ciąg zbyt krótki, limitacja API" -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:889 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:923 msgid "Searching for exact match..." msgstr "Szukanie dokładnego dopasowania..." -#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:892 +#: /home/kwpolska/git/pkgbuilder/pkgbuilder.py:926 msgid "not found" msgstr "nie znaleziono" diff --git a/pkgbuilder.py b/pkgbuilder.py index de57e7f..c401753 100755 --- a/pkgbuilder.py +++ b/pkgbuilder.py @@ -1,5 +1,5 @@ #!/usr/bin/python3 -# PKGBUILDer v2.1.2.8 +# PKGBUILDer v2.1.2.9 # A Python AUR helper/library. # Copyright (C) 2011, Kwpolska # All rights reserved. @@ -51,7 +51,7 @@ import gettext import functools -VERSION = '2.1.2.8' +VERSION = '2.1.2.9' T = gettext.translation('pkgbuilder', '/usr/share/locale', fallback='C') _ = T.gettext @@ -291,7 +291,6 @@ def multiinfo(self, args, prot = 'http'): :Returns: data from the API. :Exceptions: urllib.error.URLError, urllib.error.HTTPError. :Message codes: none.""" - return json.loads(self.jsonmultiinfo(args, prot)) ### Utils common global utilities ### @@ -594,6 +593,8 @@ def depcheck(self, depends): parseddeps[dep] = 1 elif self.utils.info(dep) != None: parseddeps[dep] = 2 + elif dep == '': + dep = '' #workaround, but this is supposed to do nothing else: parseddeps[dep] = -1 raise PBError(_('[ERR3201] depcheck: cannot find {0} \ @@ -714,9 +715,11 @@ def gather_foreign_pkgs(self): :Arguments: none. :Input: none. :Output: none. -:Returns: foreign packages. +:Returns: foreign packages (format: [['pkgname', 'pkgver']] :Exceptions: none. -:Message codes: none.""" +:Message codes: none. +:Former data: + 2.1.2.8 return format: ['pkgname']""" # Based on paconky.py. installed = set(p for p in self.localdb.pkgcache) @@ -753,7 +756,7 @@ def list_upgradeable(self, pkglist): for i in aurlist: pkg = self.localdb.get_pkg(i['Name']) if pyalpm.vercmp(i['Version'], pkg.version) > 0: - upgradeable.append(i['Name']) + upgradeable.append([i['Name'], i['Version']]) return upgradeable def auto_upgrade(self): @@ -767,19 +770,35 @@ def auto_upgrade(self): :Message codes: none. :Notice: things break here A LOT.""" pblog('Ran auto_upgrade.') - fancy_msg(_('Gathering data about packages...')) + if DS.pacman == True: + print(':: '+_('Gathering data about packages...')) + else: + fancy_msg(_('Gathering data about packages...')) foreign = self.gather_foreign_pkgs() upgradeable = self.list_upgradeable(foreign.keys()) - upglen = len(upgradeable) + upstring = ' '.join('-'.join(words) for words in upgradeable) + uplen = len(upgradeable) - fancy_msg(_('{0} upgradeable packages found:').format(upglen)) - if upglen == 0: - fancy_msg2(_('there is nothing to do')) - return 0 - fancy_msg2(' '.join(upgradeable)) - query = (DS.colors['green']+'==>'+DS.colors['all_off']+ - DS.colors['bold']+' '+_('Proceed with installation? \ + #fancy_msg(_('{0} upgradeable packages found:').format(upglen)) + if DS.pacman == True: + print(_(':: Starting full AUR upgrade...')) + if uplen == 0: + print(_(' there is nothing to do')) + return 0 + + print('\n'+_('Targets ({0}): ').format(uplen)+upstring+'\n') + query = _('Proceed with installation? [Y/n] ') + + else: + fancy_msg(_('{0} upgradeable packages found:').format(uplen)) + if uplen == 0: + fancy_msg2(_('there is nothing to do')) + return 0 + + fancy_msg2(upstring) + query = (DS.colors['green']+'==>'+DS.colors['all_off']+ + DS.colors['bold']+' '+_('Proceed with installation? \ [Y/n] ')+DS.colors['all_off']) yesno = input(query) yesno = yesno + ' ' # cheating... diff --git a/scripts/pkgbuilder b/scripts/pkgbuilder index d64a487..f742b29 100755 --- a/scripts/pkgbuilder +++ b/scripts/pkgbuilder @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # This file is a part of PKGBUILDer. -# File version: 2.1.2.8 +# File version: 2.1.2.9 # # Copyright (C) 2011, Kwpolska # All rights reserved. diff --git a/setup.py b/setup.py index 8825d5f..20e8479 100755 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from distutils.core import setup setup(name='pkgbuilder', - version='2.1.2.8', + version='2.1.2.9', description='An AUR helper (and library) in python3', author='Kwpolska', author_email='kwpolska@kwpolska.tk',