From 6816ab2ecc753ce5a34e1b7b6cf6128e1c24ef0a Mon Sep 17 00:00:00 2001 From: Kwpolska Date: Tue, 30 Oct 2012 20:55:48 +0100 Subject: [PATCH] v2.1.5.7: important bugfixes Signed-off-by: Kwpolska --- CHANGELOG.rst | 7 ++++-- CONTRIBUTING.rst | 4 ++-- PKGBUILD | 4 ++-- PKGBUILD-git | 2 +- README | 4 ++-- README.rst | 4 ++-- docs/CHANGELOG.rst | 7 ++++-- docs/CONTRIBUTING.rst | 4 ++-- docs/LICENSE.rst | 4 ++-- docs/README.rst | 4 ++-- docs/TODO.rst | 4 ++-- docs/aur.rst | 4 ++-- docs/build.rst | 4 ++-- docs/conf.py | 2 +- docs/main.rst | 4 ++-- docs/pb.8.gz | Bin 1585 -> 1586 bytes docs/pb.rst | 4 ++-- docs/pbds.rst | 4 ++-- docs/pkgbuilder.8.gz | Bin 1894 -> 1895 bytes docs/pkgbuilder.rst | 4 ++-- docs/sample-scripts.rst | 4 ++-- docs/upgrade.rst | 4 ++-- docs/utils.rst | 4 ++-- docs/wrapper.rst | 4 ++-- locale/en/LC_MESSAGES/pkgbuilder.mo | Bin 10297 -> 10297 bytes locale/en/LC_MESSAGES/pkgbuilder.po | 34 +++++++++++++------------- locale/ja/LC_MESSAGES/pkgbuilder.mo | Bin 11417 -> 11417 bytes locale/ja/LC_MESSAGES/pkgbuilder.po | 34 +++++++++++++------------- locale/pl/LC_MESSAGES/pkgbuilder.mo | Bin 10808 -> 10808 bytes locale/pl/LC_MESSAGES/pkgbuilder.po | 34 +++++++++++++------------- messages.pot | 36 ++++++++++++++-------------- pkgbuilder/__init__.py | 4 ++-- pkgbuilder/aur.py | 2 +- pkgbuilder/build.py | 3 +-- pkgbuilder/main.py | 2 +- pkgbuilder/pbds.py | 2 +- pkgbuilder/upgrade.py | 9 ++++--- pkgbuilder/utils.py | 2 +- pkgbuilder/wrapper.py | 2 +- setup.py | 2 +- 40 files changed, 130 insertions(+), 126 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e763fc0..b9e182b 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-28 -:Version: 2.1.5.6 +:Date: 2012-10-30 +:Version: 2.1.5.7 .. index:: CHANGELOG @@ -23,6 +23,9 @@ PKGBUILDer uses the following versioning scheme: Generation 2 ============ +:2.1.5.7: Fixed some bugs that managed to slip through while working on + 2.1.5.6. +;2.1.5.6: Added ABS support. :2.1.5.4—2.1.5.5: Applying patches from vadmium/pkgbuilder, also adding a few other fixes and changing the ``pb`` version number up to 0.2.0. diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index d098546..d0bd063 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -4,8 +4,8 @@ Appendix A. Contribution rules :Author: Kwpolska :Copyright: © 2011-2012, Kwpolska. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2012-10-28 -:Version: 2.1.5.6 +:Date: 2012-10-30 +:Version: 2.1.5.7 .. index:: contributing diff --git a/PKGBUILD b/PKGBUILD index a177d2f..c987f07 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Kwpolska pkgname=pkgbuilder -pkgver=2.1.5.6 +pkgver=2.1.5.7 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=('8f0d6b2944c80ff5edb33361dfd282df') +md5sums=('8eb6f6fb05e350bd4411abe926b515ae') package() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/PKGBUILD-git b/PKGBUILD-git index 274dfd7..7c7f359 100644 --- a/PKGBUILD-git +++ b/PKGBUILD-git @@ -1,6 +1,6 @@ # Maintainer: Kwpolska pkgname=pkgbuilder-git -pkgver=20121028 +pkgver=20121030 pkgrel=1 pkgdesc='A Python AUR helper/library. Version from git.' arch=('any') diff --git a/README b/README index 381bab3..04bc257 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-28 -:Version: 2.1.5.6 +:Date: 2012-10-30 +:Version: 2.1.5.7 .. index: README diff --git a/README.rst b/README.rst index 381bab3..04bc257 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-28 -:Version: 2.1.5.6 +:Date: 2012-10-30 +:Version: 2.1.5.7 .. index: README diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index e763fc0..b9e182b 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-28 -:Version: 2.1.5.6 +:Date: 2012-10-30 +:Version: 2.1.5.7 .. index:: CHANGELOG @@ -23,6 +23,9 @@ PKGBUILDer uses the following versioning scheme: Generation 2 ============ +:2.1.5.7: Fixed some bugs that managed to slip through while working on + 2.1.5.6. +;2.1.5.6: Added ABS support. :2.1.5.4—2.1.5.5: Applying patches from vadmium/pkgbuilder, also adding a few other fixes and changing the ``pb`` version number up to 0.2.0. diff --git a/docs/CONTRIBUTING.rst b/docs/CONTRIBUTING.rst index d098546..d0bd063 100644 --- a/docs/CONTRIBUTING.rst +++ b/docs/CONTRIBUTING.rst @@ -4,8 +4,8 @@ Appendix A. Contribution rules :Author: Kwpolska :Copyright: © 2011-2012, Kwpolska. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -:Date: 2012-10-28 -:Version: 2.1.5.6 +:Date: 2012-10-30 +:Version: 2.1.5.7 .. index:: contributing diff --git a/docs/LICENSE.rst b/docs/LICENSE.rst index 7dff2ab..298ed91 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-28 -:Version: 2.1.5.6 +:Date: 2012-10-30 +:Version: 2.1.5.7 .. index:: LICENSE diff --git a/docs/README.rst b/docs/README.rst index 381bab3..04bc257 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-28 -:Version: 2.1.5.6 +:Date: 2012-10-30 +:Version: 2.1.5.7 .. index: README diff --git a/docs/TODO.rst b/docs/TODO.rst index 13b46d3..042ea52 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-28 -:Version: 2.1.5.6 +:Date: 2012-10-30 +:Version: 2.1.5.7 .. index:: TODO diff --git a/docs/aur.rst b/docs/aur.rst index 9e25eb5..e863896 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-28 -:Version: 2.1.5.6 +:Date: 2012-10-30 +:Version: 2.1.5.7 .. index:: AUR; RPC .. index:: RPC diff --git a/docs/build.rst b/docs/build.rst index ba77c9b..7dcf596 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-28 -:Version: 2.1.5.6 +:Date: 2012-10-30 +:Version: 2.1.5.7 .. index:: Build .. versionadded:: 2.1.0.0 diff --git a/docs/conf.py b/docs/conf.py index cabcb93..7bed8a9 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.6' +release = '2.1.5.7' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/main.rst b/docs/main.rst index 339df0e..11d2d86 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-28 -:Version: 2.1.5.6 +:Date: 2012-10-30 +:Version: 2.1.5.7 .. index:: main .. versionadded:: 2.1.3.0 diff --git a/docs/pb.8.gz b/docs/pb.8.gz index a69e5ba8d738bb5d42ed6923e80575d187dffaf2..d158f66f9e35be5d408ab184122e052ecd07e3f7 100644 GIT binary patch literal 1586 zcmV-22F>{&iwFo$Fpy9H18`z4H~^Jb+ioI95Pk2jC|QYw6&Q?@RaVx@3fRa-YhwgB z+128QW~PA-!_1_+$1IX1oH}*7Cz_nlz09bPb47ENDI=Xq zXlC*i88vdIj9qC|GFIPRB=8&G(xCI#uss-bhxCz7&d*xsjn-M?*RvD6M6KvU^gEsg zpKm&ky}N5=XeF~!rY9mA-BQ1O-xb(zWKm#h(x5i2tCv}B5JrsUB(sF}7QElgkg@I@ zvkjdkDszogJ*$+?crsBfo*k+pH|}1Vxz5C7@>7c@lk6LIto+cE2wQmYn62%6SbcG1 z-Mc%VL_@rtJbOAa*g7_N{v@I*k6!<}+aHSvg^6C}M1@foBBJ4lI6FMOLFL^DUqf+Z zZ-wYDt#_Q~)?HL#(qn%cCk?xPeX#My4QBE*`9Uz>t#%{CmZ|lRT0{arvZ3^eg0Z8o z{fEJ*HxiL8#AMbhrjyx#KIH{>iq5l3`j!{`V4vulL)OaKC%^N$JGvV72IJmCf4h0d ze6~@Osm*Db8dX&dNzY&sW|rLR+6qA87K-xOOvhTL=y#Nu;HsKvKMs8->dZQsrj`d+B;z_c+vi_+0UJh z)dda9EMw;{Z8j10URHpn$#X|Ba7h$011{1!lNSI+Byz<7Ao@*S8nPSf)G8vjOxp2g z2`J`eDh-vEF~&Mt>oldQLJQ`r!b@as1f%3V71G)@U;*?hqdZf)^+x?uY6vLRe5K&k zz|UmX3H9V!2ckVdP}@wF5w-i*c=gXd_cl!J2xmQp73YFbA5~34JWHhYu-hnd#A~=_ zK7dJMREGjj8g`S#Oh{>zPXxhAJ87Uyh&I@UoiTE)c8SAXcC8)QCS#|cadt3zo^hVE z!6SGeSIVKtu+y7)d{AO<&2CEH4E_bLN*Y+>N26v&*+mtiEsMF4iP|;?q|l;Y>z=6$ zva-&KgA{hLzrv*+=q`D0>Kp@U?5E3ZibAQek!#pBqOs; zmF8iIj1pCZD7+^-@A66NfI4>#ClfNjOeG$S21xd-xji@^kETk57Xfb*9kXxIDvE=~ zKA5aCqq!H8B=MMd$^xuX1q^ny-hp9-WqCj8=paCk$7RLy=dIipo6m+WJOfT`BMpp6m0J=D5!I7 zmzY17zFgmgcy_Hl-O%TCk*9VknaoucLQUja*?gr$DzkaX9X3TJJNVv8wiFjXlkw9VCD zp`eHfDydUerr>T_+5Thu5IOGS%aBL=aeVtQ6x#sk)3N23LfqlTky%_iI-_fySW{U|NbR>FSQ!{(Ny0v k&fjTob{}6LW0J=u^wBaw{ihidDSQe252&hgQ?d;J0G9_F3jhEB literal 1585 zcmV-12G02(iwFoJAB|7|18`z4H~^Jb+ioI95Pk2jC|QYw6&Q?_jaJsm3fRa-YhwgB z$!hUKGt)qaVP?|ZW0p_KZ{*8zs(ZND#t#+`%=D!$r%s*ji6$p>FEc9ST+v)*%1EaY znwfk>Mva^)V^rLmecXzD}tz=fp^h89XTk5y(y8`=-EDB6b8q}tB^)ky1!ice)WR}q0g7=#lGS;1A zwxP2`Wv-E`XO+?!PbR9xvqM$n#@$OZ*O{11ernNVl6}XHl^=Q%VG9o)v$dTMt1phM zdw1uPXo$CyXHQ24TgL{^pF~vU(d%D#`(qKIFwv`=s4(h6L^K=`XNRXZsJt8DYbcKF ztq}dC^^Wu0x{E4IdhBoGq+!>u4>sPo!Azbe9|ZH=YBxe`nOc9;A`hSDbr#*V)A z9|oh|NJO>}lUc8rPG$r8k{8@5I?pcYdtUH^eWLFUSu1Cs{Lbs{=xW#-jC&9L?dBcx z*+xyKHm7BluR(ZAf0q{MRSr%`TaxdzhS;}8ophuk;_;$Lb?if;^+LxBT3~6aEX4~I zFLgF2J%dS@S#qyyD*%aGD9UFu9c!7Q-%(!JdW5I4u(hjm49qXJsr0&ie6dbcQ|RMf<~MKX*D- z7c?xhjGe!<*+kTPSpk|R&mG0UB~i!>xJc_vUH}-8$Q1*C=r?(3$Zo7ttBBY#X~&x- zpqQ7bG*nu~80%=Q)0CzPEtszgFOj(sjFR_MNNd-C1<lnWB@TDlwRT{ejGcbQ*}>>}#(B~P zkKln^DTgA%PH*P%L5aOJyD5D$_!qn?X<&^XjhY!{7gdP1EapZgYTF!;LW_Q_d!{nT z$~r3!QrN}*3YU7Iw*)gy!mo%Q;hTB6f;}53&E2#K1Xp~3fiQu)88Tw}snn{FjLbGw znujGaN>mY|@Sg0v%O|M=>fAM)OvnH;m3S~3Alb9#_TYRxnko@q1iVdj%)UjdC=MF? zV6x7P=3Y#a#AD(q3$RKRFxb(02ihT0KCiX5YHubilA^-an?eYKR7orYJeA?8@o=g2 zj;h`j7I$@qP&% zD3kA${naDbY-fjiDr?BI@>6DM9xvgjUP)>g@ItsHR|097h9J?z-M`xRgS#%;HXM(1 z7U6<29*C$z#T0cPQL%9gcyUJB1q_JZfx6NlOzI5Hf?7M)e(vx>h=hxg8YL5u zFB1nsRwrc(#d;0`L-AR=7V=qbRa_-Uu|5@Cu5lIA-YFC8Wdiz52BSs3wlA^HO~5Fu zWYgQ#Tb|liW;dm{Vxn8WnRE5q_zWtG#0yL9MdO|Z9h}V|E22uypGr8SV0(W-L7i*6 z#QeGR*Y!<^XV==(4Sih~d1{xE$y`+-)I_e8%~wjKGMks&VNa=>2h-L=uq zDK2Pq8m<%FF17DQ57mvJIt6N)fTW`@xLQnpUN~3Si)Irui*g#p`Kr0iySeuaihdkAjfk>D|DX :Copyright: © 2011-2012, Kwpolska. :License: BSD (see /LICENSE or Appendix B.) -:Date: 2012-10-28 -:Version: 2.1.5.6 +:Date: 2012-10-30 +:Version: 2.1.5.7 :Wrapper Version: 0.2.1 :Manual section: 8 :Manual group: PKGBUILDer manual diff --git a/docs/pbds.rst b/docs/pbds.rst index 20756fc..a337725 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-28 -:Version: 2.1.5.6 +:Date: 2012-10-30 +:Version: 2.1.5.7 .. module: pbds diff --git a/docs/pkgbuilder.8.gz b/docs/pkgbuilder.8.gz index 6b11dd75f1a2bae3e325e4f34ffccd6d44c2a2e1..6708efa0652212be078542f11cec0b7417a10102 100644 GIT binary patch delta 1848 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 diff --git a/docs/pkgbuilder.rst b/docs/pkgbuilder.rst index 793df96..7135f31 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-28 -:Version: 2.1.5.6 +:Date: 2012-10-30 +:Version: 2.1.5.7 :Manual section: 8 :Manual group: PKGBUILDer manual diff --git a/docs/sample-scripts.rst b/docs/sample-scripts.rst index bfaddfb..488217a 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-28 -:Version: 2.1.5.6 +:Date: 2012-10-30 +:Version: 2.1.5.7 .. index:: sample scripts diff --git a/docs/upgrade.rst b/docs/upgrade.rst index 1ea5f81..f9665d1 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-28 -:Version: 2.1.5.6 +:Date: 2012-10-30 +:Version: 2.1.5.7 .. index:: Upgrade .. index:: Syu diff --git a/docs/utils.rst b/docs/utils.rst index 7d10fcb..8d486a3 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-28 -:Version: 2.1.5.6 +:Date: 2012-10-30 +:Version: 2.1.5.7 .. index:: Utils .. automodule:: pkgbuilder.utils diff --git a/docs/wrapper.rst b/docs/wrapper.rst index cc1a5a6..56c4903 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-28 -:Version: 2.1.5.6 +:Date: 2012-10-30 +:Version: 2.1.5.7 :PBWrapper Version: 0.2.1 .. index:: wrapper diff --git a/locale/en/LC_MESSAGES/pkgbuilder.mo b/locale/en/LC_MESSAGES/pkgbuilder.mo index 0fb426834fcd7d23a3e0a7ebbc5c09301fe7d183..715b80d2a017f674c9ef8630b9453abfd52fc884 100644 GIT binary patch delta 26 hcmdlPurpvopg5!X\n" -"POT-Creation-Date: 2012-10-28 13:03+0100\n" +"POT-Creation-Date: 2012-10-30 20:53+0100\n" "PO-Revision-Date: 2012-09-08 12:44+0100\n" "Last-Translator: Kwpolska \n" "Language-Team: Kwpolska \n" @@ -80,55 +80,55 @@ msgstr "extract: no files extracted" msgid "depcheck: cannot find {} anywhere" msgstr "depcheck: cannot find {} anywhere" -#: pkgbuilder/build.py:249 +#: pkgbuilder/build.py:248 msgid "Package {} not found." msgstr "Package {} not found." -#: pkgbuilder/build.py:252 +#: pkgbuilder/build.py:251 msgid "Building {}..." msgstr "Building {}..." -#: pkgbuilder/build.py:260 +#: pkgbuilder/build.py:259 msgid "Synchronizing the ABS tree..." msgstr "Synchronizing the ABS tree..." -#: pkgbuilder/build.py:272 +#: pkgbuilder/build.py:271 msgid "Failed to synchronize the ABS tree." msgstr "Failed to synchronize the ABS tree." -#: pkgbuilder/build.py:277 +#: pkgbuilder/build.py:276 msgid "Downloading the tarball..." msgstr "Downloading the tarball..." -#: pkgbuilder/build.py:280 +#: pkgbuilder/build.py:279 msgid "{} kB downloaded" msgstr "{} kB downloaded" -#: pkgbuilder/build.py:282 +#: pkgbuilder/build.py:281 msgid "Extracting..." msgstr "Extracting..." -#: pkgbuilder/build.py:283 +#: pkgbuilder/build.py:282 msgid "{} files extracted" msgstr "{} files extracted" -#: pkgbuilder/build.py:288 +#: pkgbuilder/build.py:287 msgid "Checking dependencies..." msgstr "Checking dependencies..." -#: pkgbuilder/build.py:291 +#: pkgbuilder/build.py:290 msgid "found in system" msgstr "found in system" -#: pkgbuilder/build.py:291 +#: pkgbuilder/build.py:290 msgid "found in repos" msgstr "found in repos" -#: pkgbuilder/build.py:292 +#: pkgbuilder/build.py:291 msgid "found in the AUR" msgstr "found in the AUR" -#: pkgbuilder/build.py:295 +#: pkgbuilder/build.py:294 msgid "none found" msgstr "none found" @@ -284,11 +284,11 @@ msgstr "{}: local ({}) is newer than aur ({})" msgid "there is nothing to do" msgstr "there is nothing to do" -#: pkgbuilder/upgrade.py:158 pkgbuilder/upgrade.py:178 +#: pkgbuilder/upgrade.py:157 pkgbuilder/upgrade.py:177 msgid "Targets ({}): " msgstr "Targets ({}): " -#: pkgbuilder/upgrade.py:176 pkgbuilder/upgrade.py:182 +#: pkgbuilder/upgrade.py:175 pkgbuilder/upgrade.py:181 msgid "Proceed with installation? [Y/n] " msgstr "Proceed with installation? [Y/n] " diff --git a/locale/ja/LC_MESSAGES/pkgbuilder.mo b/locale/ja/LC_MESSAGES/pkgbuilder.mo index 7f4705f644e953d5d65c74c4c35a8d999f9a8a85..9db85085ee0a374bbc8b830110d8f158ef104ec2 100644 GIT binary patch delta 26 icmbOkIWuxYf*7Ou\n" -"POT-Creation-Date: 2012-10-28 13:03+0100\n" +"POT-Creation-Date: 2012-10-30 20:53+0100\n" "PO-Revision-Date: 2012-09-21 20:21+0200\n" "Last-Translator: Colin Woodbury \n" "Language-Team: Colin Woodbury \n" @@ -80,56 +80,56 @@ msgstr "抽出状態：ファイルは1つも抽出されなかった" msgid "depcheck: cannot find {} anywhere" msgstr "従属パッケージ状態：「{}」をどこでも見つからなかった" -#: pkgbuilder/build.py:249 +#: pkgbuilder/build.py:248 msgid "Package {} not found." msgstr "パッケージ「{}」は見つからなかった。" -#: pkgbuilder/build.py:252 +#: pkgbuilder/build.py:251 msgid "Building {}..." msgstr "「{}」を作成中・・・" -#: pkgbuilder/build.py:260 +#: pkgbuilder/build.py:259 #, fuzzy msgid "Synchronizing the ABS tree..." msgstr "パッケージデーターベースを同期中・・・" -#: pkgbuilder/build.py:272 +#: pkgbuilder/build.py:271 msgid "Failed to synchronize the ABS tree." msgstr "" -#: pkgbuilder/build.py:277 +#: pkgbuilder/build.py:276 msgid "Downloading the tarball..." msgstr "ターボールをダウンロード中・・・" -#: pkgbuilder/build.py:280 +#: pkgbuilder/build.py:279 msgid "{} kB downloaded" msgstr "{} kBをダウンロード済み" -#: pkgbuilder/build.py:282 +#: pkgbuilder/build.py:281 msgid "Extracting..." msgstr "抽出中・・・" -#: pkgbuilder/build.py:283 +#: pkgbuilder/build.py:282 msgid "{} files extracted" msgstr "ファイルを{}個抽出した" -#: pkgbuilder/build.py:288 +#: pkgbuilder/build.py:287 msgid "Checking dependencies..." msgstr "従属パッケージを確認中・・・" -#: pkgbuilder/build.py:291 +#: pkgbuilder/build.py:290 msgid "found in system" msgstr "インストール済み" -#: pkgbuilder/build.py:291 +#: pkgbuilder/build.py:290 msgid "found in repos" msgstr "リポジトリに存在" -#: pkgbuilder/build.py:292 +#: pkgbuilder/build.py:291 msgid "found in the AUR" msgstr "AURに存在" -#: pkgbuilder/build.py:295 +#: pkgbuilder/build.py:294 msgid "none found" msgstr "従属パッケージなし" @@ -284,11 +284,11 @@ msgstr "{}: ローカル「{}」はAURの「{}」より最新" msgid "there is nothing to do" msgstr "することがない" -#: pkgbuilder/upgrade.py:158 pkgbuilder/upgrade.py:178 +#: pkgbuilder/upgrade.py:157 pkgbuilder/upgrade.py:177 msgid "Targets ({}): " msgstr "「{}」の該当パッケージ：" -#: pkgbuilder/upgrade.py:176 pkgbuilder/upgrade.py:182 +#: pkgbuilder/upgrade.py:175 pkgbuilder/upgrade.py:181 msgid "Proceed with installation? [Y/n] " msgstr "続行？ [Y/n]" diff --git a/locale/pl/LC_MESSAGES/pkgbuilder.mo b/locale/pl/LC_MESSAGES/pkgbuilder.mo index d033329fd37d7254550cc91ac42f8e1a0f097113..1ae28bc3a46bab20600ce89f201a27ca55533d7f 100644 GIT binary patch delta 26 hcmdlHvLj?epg5!X\n" -"POT-Creation-Date: 2012-10-28 13:03+0100\n" +"POT-Creation-Date: 2012-10-30 20:53+0100\n" "PO-Revision-Date: 2012-09-08 12:44+0100\n" "Last-Translator: Kwpolska \n" "Language-Team: Kwpolska \n" @@ -82,55 +82,55 @@ msgstr "extract: wypakowano 0 plików" msgid "depcheck: cannot find {} anywhere" msgstr "depcheck: nie można nigdzie znaleźć pakietu {}" -#: pkgbuilder/build.py:249 +#: pkgbuilder/build.py:248 msgid "Package {} not found." msgstr "Nie znaleziono pakietu {}." -#: pkgbuilder/build.py:252 +#: pkgbuilder/build.py:251 msgid "Building {}..." msgstr "Budowanie {}..." -#: pkgbuilder/build.py:260 +#: pkgbuilder/build.py:259 msgid "Synchronizing the ABS tree..." msgstr "Synchronizowanie drzewa ABS..." -#: pkgbuilder/build.py:272 +#: pkgbuilder/build.py:271 msgid "Failed to synchronize the ABS tree." msgstr "Nie udało się zsynchronizować drzewa ABS." -#: pkgbuilder/build.py:277 +#: pkgbuilder/build.py:276 msgid "Downloading the tarball..." msgstr "Pobieranie tarballa..." -#: pkgbuilder/build.py:280 +#: pkgbuilder/build.py:279 msgid "{} kB downloaded" msgstr "pobrano {} kB" -#: pkgbuilder/build.py:282 +#: pkgbuilder/build.py:281 msgid "Extracting..." msgstr "Wypakowywanie..." -#: pkgbuilder/build.py:283 +#: pkgbuilder/build.py:282 msgid "{} files extracted" msgstr "wypakowano {} plików" -#: pkgbuilder/build.py:288 +#: pkgbuilder/build.py:287 msgid "Checking dependencies..." msgstr "Sprawdzanie zależności..." -#: pkgbuilder/build.py:291 +#: pkgbuilder/build.py:290 msgid "found in system" msgstr "znaleziono w systemie" -#: pkgbuilder/build.py:291 +#: pkgbuilder/build.py:290 msgid "found in repos" msgstr "znaleziono w repozytoriach" -#: pkgbuilder/build.py:292 +#: pkgbuilder/build.py:291 msgid "found in the AUR" msgstr "znaleziono w AUR" -#: pkgbuilder/build.py:295 +#: pkgbuilder/build.py:294 msgid "none found" msgstr "brak" @@ -286,11 +286,11 @@ msgstr "{}: local ({}) jest nowsze niż aur ({})" msgid "there is nothing to do" msgstr "nie ma nic do zrobienia" -#: pkgbuilder/upgrade.py:158 pkgbuilder/upgrade.py:178 +#: pkgbuilder/upgrade.py:157 pkgbuilder/upgrade.py:177 msgid "Targets ({}): " msgstr "Cele ({}):" -#: pkgbuilder/upgrade.py:176 pkgbuilder/upgrade.py:182 +#: pkgbuilder/upgrade.py:175 pkgbuilder/upgrade.py:181 msgid "Proceed with installation? [Y/n] " msgstr "Kontynuować instalację? [Y/n] " diff --git a/messages.pot b/messages.pot index cb5c03d..2b61d1b 100644 --- a/messages.pot +++ b/messages.pot @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: 2.1.5.6\n" +"Project-Id-Version: 2.1.5.7\n" "Report-Msgid-Bugs-To: Kwpolska \n" -"POT-Creation-Date: 2012-10-28 13:03+0100\n" -"PO-Revision-Date: 2012-10-28 13:03+0100\n" +"POT-Creation-Date: 2012-10-30 20:53+0100\n" +"PO-Revision-Date: 2012-10-30 20:53+0100\n" "Last-Translator: Kwpolska \n" "Language-Team: Kwpolska \n" "Language: en\n" @@ -80,55 +80,55 @@ msgstr "" msgid "depcheck: cannot find {} anywhere" msgstr "" -#: pkgbuilder/build.py:249 +#: pkgbuilder/build.py:248 msgid "Package {} not found." msgstr "" -#: pkgbuilder/build.py:252 +#: pkgbuilder/build.py:251 msgid "Building {}..." msgstr "" -#: pkgbuilder/build.py:260 +#: pkgbuilder/build.py:259 msgid "Synchronizing the ABS tree..." msgstr "" -#: pkgbuilder/build.py:272 +#: pkgbuilder/build.py:271 msgid "Failed to synchronize the ABS tree." msgstr "" -#: pkgbuilder/build.py:277 +#: pkgbuilder/build.py:276 msgid "Downloading the tarball..." msgstr "" -#: pkgbuilder/build.py:280 +#: pkgbuilder/build.py:279 msgid "{} kB downloaded" msgstr "" -#: pkgbuilder/build.py:282 +#: pkgbuilder/build.py:281 msgid "Extracting..." msgstr "" -#: pkgbuilder/build.py:283 +#: pkgbuilder/build.py:282 msgid "{} files extracted" msgstr "" -#: pkgbuilder/build.py:288 +#: pkgbuilder/build.py:287 msgid "Checking dependencies..." msgstr "" -#: pkgbuilder/build.py:291 +#: pkgbuilder/build.py:290 msgid "found in system" msgstr "" -#: pkgbuilder/build.py:291 +#: pkgbuilder/build.py:290 msgid "found in repos" msgstr "" -#: pkgbuilder/build.py:292 +#: pkgbuilder/build.py:291 msgid "found in the AUR" msgstr "" -#: pkgbuilder/build.py:295 +#: pkgbuilder/build.py:294 msgid "none found" msgstr "" @@ -282,11 +282,11 @@ msgstr "" msgid "there is nothing to do" msgstr "" -#: pkgbuilder/upgrade.py:158 pkgbuilder/upgrade.py:178 +#: pkgbuilder/upgrade.py:157 pkgbuilder/upgrade.py:177 msgid "Targets ({}): " msgstr "" -#: pkgbuilder/upgrade.py:176 pkgbuilder/upgrade.py:182 +#: pkgbuilder/upgrade.py:175 pkgbuilder/upgrade.py:181 msgid "Proceed with installation? [Y/n] " msgstr "" diff --git a/pkgbuilder/__init__.py b/pkgbuilder/__init__.py index 8d2b4e8..2de74b5 100755 --- a/pkgbuilder/__init__.py +++ b/pkgbuilder/__init__.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 # -*- encoding: utf-8 -*- -# PKGBUILDer v2.1.5.6 +# PKGBUILDer v2.1.5.7 # 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.6' +__version__ = '2.1.5.7' __author__ = 'Kwpolska' __license__ = '3-clause BSD' __docformat__ = 'restructuredtext en' diff --git a/pkgbuilder/aur.py b/pkgbuilder/aur.py index 15d2591..883d397 100755 --- a/pkgbuilder/aur.py +++ b/pkgbuilder/aur.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 # -*- encoding: utf-8 -*- -# PKGBUILDer v2.1.5.6 +# PKGBUILDer v2.1.5.7 # 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 776890d..bc54f29 100755 --- a/pkgbuilder/build.py +++ b/pkgbuilder/build.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 # -*- encoding: utf-8 -*- -# PKGBUILDer v2.1.5.6 +# PKGBUILDer v2.1.5.7 # An AUR helper (and library) in Python 3. # Copyright © 2011-2012, Kwpolska. # See /LICENSE for licensing information. @@ -223,7 +223,6 @@ def build_runner(self, pkgname, performdepcheck=True, try: pkg = None try: - pkgname[9001] pkg = self.utils.info([pkgname]) pkg = pkg[0] useabs = False diff --git a/pkgbuilder/main.py b/pkgbuilder/main.py index 4a76c42..f1f5c49 100755 --- a/pkgbuilder/main.py +++ b/pkgbuilder/main.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 # -*- encoding: utf-8 -*- -# PKGBUILDer v2.1.5.6 +# PKGBUILDer v2.1.5.7 # An AUR helper (and library) in Python 3. # Copyright © 2011-2012, Kwpolska. # See /LICENSE for licensing information. diff --git a/pkgbuilder/pbds.py b/pkgbuilder/pbds.py index cee24a5..92f7a41 100755 --- a/pkgbuilder/pbds.py +++ b/pkgbuilder/pbds.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 # -*- encoding: utf-8 -*- -# PKGBUILDer v2.1.5.6 +# PKGBUILDer v2.1.5.7 # 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 38b1d4d..a6321bd 100755 --- a/pkgbuilder/upgrade.py +++ b/pkgbuilder/upgrade.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 # -*- encoding: utf-8 -*- -# PKGBUILDer v2.1.5.6 +# PKGBUILDer v2.1.5.7 # An AUR helper (and library) in Python 3. # Copyright © 2011-2012, Kwpolska. # See /LICENSE for licensing information. @@ -154,7 +154,6 @@ def auto_upgrade(self, downgrade=False, vcsup=False): if upglen > 0: if DS.pacman: - print() targetstring = _('Targets ({}): ').format(upglen) size = subprocess.check_output(['stty', 'size']) try: @@ -166,12 +165,12 @@ def auto_upgrade(self, downgrade=False, vcsup=False): nowrap = targetstring + ' '.join(upgstrings) wrapv = textwrap.wrap(nowrap, termwidth) wrap0 = wrapv[0] - wraprest = textwrap.wrap(wrapv[1:], + wraprest = textwrap.wrap('\n'.join(wrapv[1:]), termwidth - len(targetstring)) - # TODO wraprest ' ' -> ' ' -> ' ' wraprest = [i.replace(' ', ' ').replace(' ', ' ') for i in wraprest] print(wrap0) - print('\n'.join(wraprest)) + for i in wraprest: + print(len(targetstring) * ' ' + i) print() query = _('Proceed with installation? [Y/n] ') else: diff --git a/pkgbuilder/utils.py b/pkgbuilder/utils.py index db85d37..74cd847 100755 --- a/pkgbuilder/utils.py +++ b/pkgbuilder/utils.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 # -*- encoding: utf-8 -*- -# PKGBUILDer v2.1.5.6 +# PKGBUILDer v2.1.5.7 # An AUR helper (and library) in Python 3. # Copyright © 2011-2012, Kwpolska. # See /LICENSE for licensing information. diff --git a/pkgbuilder/wrapper.py b/pkgbuilder/wrapper.py index 519906e..5756171 100755 --- a/pkgbuilder/wrapper.py +++ b/pkgbuilder/wrapper.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 # -*- encoding: utf-8 -*- # PBWrapper v0.2.0 -# PKGBUILDer v2.1.5.6 +# PKGBUILDer v2.1.5.7 # 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 75d3bc6..3988e1d 100755 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ from distutils.core import setup setup(name='pkgbuilder', - version='2.1.5.6', + version='2.1.5.7', description='An AUR helper (and library) in Python 3.', author='Kwpolska', author_email='kwpolska@kwpolska.tk',