diff --git a/PKGBUILD b/PKGBUILD index 23a9c85..d034768 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,15 +1,15 @@ # Maintainer: Kwpolska pkgname=pkgbuilder -pkgver=2.1.2.32 +pkgver=2.1.2.33 pkgrel=1 -pkgdesc="A basic Python AUR helper/library." +pkgdesc='A basic Python AUR helper/library.' arch=('any') -url="https://github.com/Kwpolska/pkgbuilder" +url='https://github.com/Kwpolska/pkgbuilder' license=('BSD') depends=('python' 'pyalpm>=0.5.1-1' 'python-pyparsing' 'python-requests') options=(!emptydirs) -source=("http://pypi.python.org/packages/source/p/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('bae9a1d745566ebf861ef5a7e2b2749f') +source=('http://pypi.python.org/packages/source/p/${pkgname}/${pkgname}-${pkgver}.tar.gz') +md5sums=('11fbf28053ffd992add0250787581058') package() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/README.rst b/README.rst index 29abab1..fb0b386 100644 --- a/README.rst +++ b/README.rst @@ -4,7 +4,7 @@ README for PKGBUILDer :Info: This is the README file for PKGBUILDer. :Author: Kwpolska :Date: #{date} -:Version: 2.1.2.32 +:Version: 2.1.2.33 PKGBUILDer. A Python AUR helper/library. ========================================= diff --git a/dist/pkgbuilder-2.1.2.33.tar.gz b/dist/pkgbuilder-2.1.2.33.tar.gz new file mode 100644 index 0000000..8ca3081 Binary files /dev/null and b/dist/pkgbuilder-2.1.2.33.tar.gz differ diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index b7cd0ff..e848989 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -4,7 +4,7 @@ Appendix C. Changelog :Info: This is a partial changelog for PKGBUILDer. :Author: Kwpolska :Date: #{date} -:Version: 2.1.2.32 +:Version: 2.1.2.33 Versioning scheme ================= diff --git a/docs/LICENSE.rst b/docs/LICENSE.rst index 6c78a9f..50c36b4 100644 --- a/docs/LICENSE.rst +++ b/docs/LICENSE.rst @@ -4,7 +4,7 @@ Appendix B. License for PKGBUILDer :Info: This is an appendix to the PKGBUILDer documentation. :Author: Kwpolska :Date: #{date} -:Version: 2.1.2.32 +:Version: 2.1.2.33 Copyright (C) 2011-2012, Kwpolska. All rights reserved. diff --git a/docs/README.rst b/docs/README.rst index 29abab1..fb0b386 100644 --- a/docs/README.rst +++ b/docs/README.rst @@ -4,7 +4,7 @@ README for PKGBUILDer :Info: This is the README file for PKGBUILDer. :Author: Kwpolska :Date: #{date} -:Version: 2.1.2.32 +:Version: 2.1.2.33 PKGBUILDer. A Python AUR helper/library. ========================================= diff --git a/docs/classes.rst b/docs/classes.rst index 6f234f6..d431da1 100644 --- a/docs/classes.rst +++ b/docs/classes.rst @@ -5,7 +5,7 @@ Classes in PKGBUILDer :Author: Kwpolska :Copyright: See Appendix B. :Date: #{date} -:Version: 2.1.2.32 +:Version: 2.1.2.33 .. index:: classes .. module:: PKGBUILDer @@ -260,7 +260,7 @@ four additional ones. :Returns: nothing. :Exceptions: PBError. :Message codes: - ERR3301, ERR34?? (ERR3401, ERR3450, ERR3451, ERR3452), INF3450. + WRN3401, ERR3402, INF3450, ERR3451, ERR3452. :Former data: 2.0 Name: build. diff --git a/docs/conf.py b/docs/conf.py index 8975031..aeb5d09 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -50,7 +50,7 @@ # The short X.Y version. version = '2.1.2' # The full version, including alpha/beta/rc tags. -release = '2.1.2.32' +release = '2.1.2.33' # 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 d81cf82..55ae074 100644 --- a/docs/messagecodes.rst +++ b/docs/messagecodes.rst @@ -4,7 +4,7 @@ Appendix A. PKGBUILDer message numbers list :Info: This is an appendix to the PKGBUILDer documentation. :Author: Kwpolska :Date: #{date} -:Version: 2.1.2.32 +:Version: 2.1.2.33 In order to help debugging, messages are numbered. Each message number has four digits: the first one is the @@ -18,7 +18,7 @@ Categories 3. Build class 1. download, extract 2. depcheck, predepcheck - 3. makepkg + 3. makepkg (defunct) 4. auto_build, validation 4. Update class 5. __main__ functionality (when run as an AUR helper) @@ -45,7 +45,7 @@ INF# Component Message ======== =============== ========================================= .. [3450] occurs, when PKGBUILDer finds out that the package that - was meant to be bulit is correctly installed. + was meant to be bulit is correctly installed.i Warnings ======== @@ -53,9 +53,13 @@ Warnings ======== =============== ========================================= WRN# Component Message ======== =============== ========================================= -0 none Nothing there yet. +[3401]_ auto_build AUR dependency required ======== =============== ========================================= +.. [3401] occurs, when the $depends or $makedepends array of the + PKGBUILD request a package, which exists in the AUR. It is plain + informational. Right after displaying this message, the script will + automatically build the required packages. Errors ====== @@ -70,8 +74,7 @@ ERR# Component Message [3151]_ extract 0 files extracted [3201]_ depcheck cannot find the requested dependency [3202]_ depcheck UnicodeDecodeError while reading file -[3301]_ makepkg returned 1 -[3401]_ auto_build AUR dependency required +[3402]_ auto_build Something went wrong. [3451]_ validation not installed [3452]_ validation outdated [5001]_ `__main__` Aborted by user! Exiting… @@ -109,13 +112,8 @@ Explainations: 20` PKGBUILDer’s error message is also valid and will help the maintainer. -.. [3301] occurs, when makepkg exits with the return code 1. It means - that something bad happened. Refer to makepkg’s output for more info. - -.. [3401] occurs, when the $depends or $makedepends array of the - PKGBUILD request a package, which exists in the AUR. It is plain - informational. Right after displaying this message, the script will - automatically build the required packages. +.. [3402] (formerly 3301) occurs, when something bad happens while building. + Refer to the output for more info. .. [3451] occurs, when PKGBUILDer finds out that the package is not installed on your system. It means that the package that was bulit diff --git a/docs/pkgbuilder.8.gz b/docs/pkgbuilder.8.gz index 3083f36..ed135c7 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 44e9bb3..3145c29 100644 --- a/docs/pkgbuilder.rst +++ b/docs/pkgbuilder.rst @@ -5,7 +5,7 @@ PKGBUILDer :Author: Kwpolska :Copyright: See Appendix B. :Date: #{date} -:Version: 2.1.2.32 +:Version: 2.1.2.33 :Manual section: 8 :Manual group: PKGBUILDer manual diff --git a/locale/en/LC_MESSAGES/pkgbuilder.mo b/locale/en/LC_MESSAGES/pkgbuilder.mo index deae7bf..1fde5eb 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 02dec1f..4ab7ef4 100644 --- a/locale/en/LC_MESSAGES/pkgbuilder.po +++ b/locale/en/LC_MESSAGES/pkgbuilder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: $version\n" "Report-Msgid-Bugs-To: Kwpolska \n" -"POT-Creation-Date: 2012-07-30 11:31+0200\n" +"POT-Creation-Date: 2012-07-30 12:34+0200\n" "PO-Revision-Date: 2012-07-27 13:44+0100\n" "Last-Translator: Kwpolska \n" "Language-Team: Kwpolska \n" @@ -65,75 +65,75 @@ msgid "[INF3450] validation: installed {0}" msgstr "[INF3450] validation: installed {0}" #: pkgbuilder.py:504 -msgid "[ERR3301] makepkg returned 1." -msgstr "[ERR3301] makepkg returned 1." +msgid "[ERR3402] Something went wrong. EC={0} EM={1}" +msgstr "[ERR3402] Something went wrong. EC={0} EM={1}" -#: pkgbuilder.py:509 -msgid "[ERR3401] Building more AUR packages is required." -msgstr "[ERR3401] Building more AUR packages is required." +#: pkgbuilder.py:508 +msgid "[WRN3401] Building more AUR packages is required." +msgstr "[WRN3401] Building more AUR packages is required." -#: pkgbuilder.py:533 +#: pkgbuilder.py:532 msgid "[ERR3102] download: HTTP Error {0}" msgstr "[ERR3102] download: HTTP Error {0}" -#: pkgbuilder.py:536 +#: pkgbuilder.py:535 msgid "[ERR3101] download: 0 bytes downloaded" msgstr "[ERR3101] download: 0 bytes downloaded" -#: pkgbuilder.py:559 +#: pkgbuilder.py:558 msgid "[ERR3151] extract: no files extracted" msgstr "[ERR3151] extract: no files extracted" -#: pkgbuilder.py:642 pkgbuilder.py:706 +#: pkgbuilder.py:641 pkgbuilder.py:705 msgid "[ERR3201] depcheck: cannot find {0} anywhere" msgstr "[ERR3201] depcheck: cannot find {0} anywhere" -#: pkgbuilder.py:670 +#: pkgbuilder.py:669 msgid "[ERR3001] Package {0} not found." msgstr "[ERR3001] Package {0} not found." -#: pkgbuilder.py:673 +#: pkgbuilder.py:672 msgid "Building {0}…" msgstr "Building {0}…" #. Okay, this package exists, great then. Thanks, user. -#: pkgbuilder.py:681 +#: pkgbuilder.py:680 msgid "Downloading the tarball…" msgstr "Downloading the tarball…" -#: pkgbuilder.py:684 +#: pkgbuilder.py:683 msgid "{0} kB downloaded" msgstr "{0} kB downloaded" -#: pkgbuilder.py:686 +#: pkgbuilder.py:685 msgid "Extracting…" msgstr "Extracting…" -#: pkgbuilder.py:687 +#: pkgbuilder.py:686 msgid "{0} files extracted" msgstr "{0} files extracted" -#: pkgbuilder.py:691 +#: pkgbuilder.py:690 msgid "Checking dependencies…" msgstr "Checking dependencies…" -#: pkgbuilder.py:698 +#: pkgbuilder.py:697 msgid "found in system" msgstr "found in system" -#: pkgbuilder.py:698 +#: pkgbuilder.py:697 msgid "found in repos" msgstr "found in repos" -#: pkgbuilder.py:699 +#: pkgbuilder.py:698 msgid "found in the AUR" msgstr "found in the AUR" -#: pkgbuilder.py:702 +#: pkgbuilder.py:701 msgid "none found" msgstr "none found" -#: pkgbuilder.py:716 +#: pkgbuilder.py:715 msgid "" "[ERR3202] depcheck: UnicodeDecodeError. The PKGBUILD cannot be read. There " "are invalid UTF-8 characters (eg. in the Maintainer field.) Error message: " @@ -143,91 +143,91 @@ msgstr "" "are invalid UTF-8 characters (eg. in the Maintainer field.) Error message: " "{0}" -#: pkgbuilder.py:822 pkgbuilder.py:824 +#: pkgbuilder.py:818 pkgbuilder.py:820 msgid "Gathering data about packages…" msgstr "Gathering data about packages…" -#: pkgbuilder.py:831 +#: pkgbuilder.py:827 msgid "Targets ({0}): " msgstr "Targets ({0}): " -#: pkgbuilder.py:833 +#: pkgbuilder.py:829 msgid "{0} upgradeable packages found:" msgstr "{0} upgradeable packages found:" -#: pkgbuilder.py:838 +#: pkgbuilder.py:834 msgid " there is nothing to do" msgstr " there is nothing to do" -#: pkgbuilder.py:840 +#: pkgbuilder.py:836 msgid "there is nothing to do" msgstr "there is nothing to do" -#: pkgbuilder.py:845 pkgbuilder.py:849 +#: pkgbuilder.py:841 pkgbuilder.py:845 msgid "Proceed with installation? [Y/n] " msgstr "Proceed with installation? [Y/n] " -#: pkgbuilder.py:875 +#: pkgbuilder.py:871 msgid "An AUR helper/library. Wrapper-friendly (pacman-like output.)" msgstr "An AUR helper/library. Wrapper-friendly (pacman-like output.)" -#: pkgbuilder.py:876 +#: pkgbuilder.py:872 msgid "You can use pacman syntax if you want to." msgstr "You can use pacman syntax if you want to." -#: pkgbuilder.py:882 +#: pkgbuilder.py:878 msgid "packages to build" msgstr "packages to build" -#: pkgbuilder.py:887 +#: pkgbuilder.py:883 msgid "don't use colors in output" msgstr "don't use colors in output" -#: pkgbuilder.py:890 +#: pkgbuilder.py:886 msgid "don't check dependencies (may break makepkg)" msgstr "don't check dependencies (may break makepkg)" -#: pkgbuilder.py:893 +#: pkgbuilder.py:889 msgid "don't install packages after building" msgstr "don't install packages after building" -#: pkgbuilder.py:896 +#: pkgbuilder.py:892 msgid "" "don't check if packages were installed after build" msgstr "" "don't check if packages were installed after build" -#: pkgbuilder.py:899 +#: pkgbuilder.py:895 msgid "pacman syntax compatiblity" msgstr "pacman syntax compatiblity" -#: pkgbuilder.py:901 +#: pkgbuilder.py:897 msgid "pacman syntax compatiblity" msgstr "pacman syntax compatiblity" -#: pkgbuilder.py:904 +#: pkgbuilder.py:900 msgid "view package information" msgstr "view package information" -#: pkgbuilder.py:906 +#: pkgbuilder.py:902 msgid "search the AUR for matching strings" msgstr "search the AUR for matching strings" -#: pkgbuilder.py:910 +#: pkgbuilder.py:906 msgid "upgrade installed AUR packages" msgstr "upgrade installed AUR packages" -#: pkgbuilder.py:913 +#: pkgbuilder.py:909 msgid "chooses protocol (default: http)" msgstr "chooses protocol (default: http)" -#: pkgbuilder.py:935 +#: pkgbuilder.py:931 msgid "Package {0} not found." msgstr "Package {0} not found." #. TRANSLATORS: space it properly. `yes/no' below are #. for `out of date'. -#: pkgbuilder.py:939 +#: pkgbuilder.py:935 msgid "" "Category : {cat}\n" "Name : {nme}\n" @@ -253,25 +253,25 @@ msgstr "" "Last Updated : {upd}\n" "Description : {dsc}\n" -#: pkgbuilder.py:956 +#: pkgbuilder.py:952 msgid "yes" msgstr "yes" -#: pkgbuilder.py:957 +#: pkgbuilder.py:953 msgid "no" msgstr "no" #. this would be too many entries. The API is really #. having this limitation, though. -#: pkgbuilder.py:972 +#: pkgbuilder.py:968 msgid "[ERR5002] search string too short, API limitation" msgstr "[ERR5002] search string too short, API limitation" -#: pkgbuilder.py:974 +#: pkgbuilder.py:970 msgid "Searching for exact match…" msgstr "Searching for exact match…" -#: pkgbuilder.py:977 INSTALL.py:62 INSTALL.py:71 INSTALL.py:80 INSTALL.py:89 +#: pkgbuilder.py:973 INSTALL.py:62 INSTALL.py:71 INSTALL.py:80 INSTALL.py:89 msgid "not found" msgstr "not found" @@ -390,3 +390,6 @@ msgstr "" "\n" "If that's what you want to do, go for it. If it isn't, run this\n" "script again." + +#~ msgid "[ERR3301] makepkg returned 1." +#~ msgstr "[ERR3301] makepkg returned 1." diff --git a/locale/pl/LC_MESSAGES/pkgbuilder.mo b/locale/pl/LC_MESSAGES/pkgbuilder.mo index 3dcc3a8..168176e 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 0d665bb..81a1c26 100644 --- a/locale/pl/LC_MESSAGES/pkgbuilder.po +++ b/locale/pl/LC_MESSAGES/pkgbuilder.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: $version\n" "Report-Msgid-Bugs-To: Kwpolska \n" -"POT-Creation-Date: 2012-07-30 11:31+0200\n" +"POT-Creation-Date: 2012-07-30 12:34+0200\n" "PO-Revision-Date: 2012-07-27 14:20+0100\n" "Last-Translator: Kwpolska \n" "Language-Team: Kwpolska \n" @@ -65,75 +65,75 @@ msgid "[INF3450] validation: installed {0}" msgstr "[INF3450] walidacja: zainstalowane {0}" #: pkgbuilder.py:504 -msgid "[ERR3301] makepkg returned 1." -msgstr "[ERR3301] makepkg zwrócił 1." +msgid "[ERR3402] Something went wrong. EC={0} EM={1}" +msgstr "[ERR3402] Coś poszło źle. EC={0} EM={1}" -#: pkgbuilder.py:509 -msgid "[ERR3401] Building more AUR packages is required." +#: pkgbuilder.py:508 +msgid "[WRN3401] Building more AUR packages is required." msgstr "[ERR3401] Należy zainstalować więcej pakietów z AUR." -#: pkgbuilder.py:533 +#: pkgbuilder.py:532 msgid "[ERR3102] download: HTTP Error {0}" msgstr "[ERR3102] download: Błąd HTTP {0}" -#: pkgbuilder.py:536 +#: pkgbuilder.py:535 msgid "[ERR3101] download: 0 bytes downloaded" msgstr "[ERR3101] download: ściągnięto 0 bajtów" -#: pkgbuilder.py:559 +#: pkgbuilder.py:558 msgid "[ERR3151] extract: no files extracted" msgstr "[ERR3151] extract: wypakowano 0 plików" -#: pkgbuilder.py:642 pkgbuilder.py:706 +#: pkgbuilder.py:641 pkgbuilder.py:705 msgid "[ERR3201] depcheck: cannot find {0} anywhere" msgstr "[ERR3201] depcheck: nie można nigdzie znaleźć pakietu {0}" -#: pkgbuilder.py:670 +#: pkgbuilder.py:669 msgid "[ERR3001] Package {0} not found." msgstr "[ERR3001] Nie znaleziono pakietu {0}." -#: pkgbuilder.py:673 +#: pkgbuilder.py:672 msgid "Building {0}…" msgstr "Budowanie {0}..." #. Okay, this package exists, great then. Thanks, user. -#: pkgbuilder.py:681 +#: pkgbuilder.py:680 msgid "Downloading the tarball…" msgstr "Ściąganie tarballa…" -#: pkgbuilder.py:684 +#: pkgbuilder.py:683 msgid "{0} kB downloaded" msgstr "ściągnięto {0} kB" -#: pkgbuilder.py:686 +#: pkgbuilder.py:685 msgid "Extracting…" msgstr "Wypakowywanie…" -#: pkgbuilder.py:687 +#: pkgbuilder.py:686 msgid "{0} files extracted" msgstr "wypakowano {0} plików" -#: pkgbuilder.py:691 +#: pkgbuilder.py:690 msgid "Checking dependencies…" msgstr "Sprawdzanie zależności…" -#: pkgbuilder.py:698 +#: pkgbuilder.py:697 msgid "found in system" msgstr "znaleziono w systemie" -#: pkgbuilder.py:698 +#: pkgbuilder.py:697 msgid "found in repos" msgstr "znaleziono w repozytoriach" -#: pkgbuilder.py:699 +#: pkgbuilder.py:698 msgid "found in the AUR" msgstr "znaleziono w AUR" -#: pkgbuilder.py:702 +#: pkgbuilder.py:701 msgid "none found" msgstr "brak" -#: pkgbuilder.py:716 +#: pkgbuilder.py:715 msgid "" "[ERR3202] depcheck: UnicodeDecodeError. The PKGBUILD cannot be read. There " "are invalid UTF-8 characters (eg. in the Maintainer field.) Error message: " @@ -142,92 +142,92 @@ msgstr "" "[ERR3202] depcheck: UnicodeDecodeError. Nie można przeczytać PKGBUILD. " "Znajdują się w nim nieprawidłowe znaki UTF-8. Treść błędu: {0}" -#: pkgbuilder.py:822 pkgbuilder.py:824 +#: pkgbuilder.py:818 pkgbuilder.py:820 msgid "Gathering data about packages…" msgstr "Zbieranie informacji o pakietach…" -#: pkgbuilder.py:831 +#: pkgbuilder.py:827 msgid "Targets ({0}): " msgstr "Cele ({0}):" -#: pkgbuilder.py:833 +#: pkgbuilder.py:829 msgid "{0} upgradeable packages found:" msgstr "Znaleziono {0} pakietów do aktualizacji:" -#: pkgbuilder.py:838 +#: pkgbuilder.py:834 msgid " there is nothing to do" msgstr " nie ma nic do zrobienia" -#: pkgbuilder.py:840 +#: pkgbuilder.py:836 msgid "there is nothing to do" msgstr "nie ma nic do zrobienia" -#: pkgbuilder.py:845 pkgbuilder.py:849 +#: pkgbuilder.py:841 pkgbuilder.py:845 msgid "Proceed with installation? [Y/n] " msgstr "Kontynuować instalację? [Y/n] " -#: pkgbuilder.py:875 +#: pkgbuilder.py:871 msgid "An AUR helper/library. Wrapper-friendly (pacman-like output.)" msgstr "" "Biblioteka/pomocnik AUR. Przyjazna dla wrapperów (wyjście podobne do " "pacmana.)" -#: pkgbuilder.py:876 +#: pkgbuilder.py:872 msgid "You can use pacman syntax if you want to." msgstr "Jeśli chcesz, możesz używać składni pacmana." -#: pkgbuilder.py:882 +#: pkgbuilder.py:878 msgid "packages to build" msgstr "pakiety do zbudowania" -#: pkgbuilder.py:887 +#: pkgbuilder.py:883 msgid "don't use colors in output" msgstr "nie używa kolorów na wyjścu" -#: pkgbuilder.py:890 +#: pkgbuilder.py:886 msgid "don't check dependencies (may break makepkg)" msgstr "nie sprawdza zależności (może popsuć makepkg)" -#: pkgbuilder.py:893 +#: pkgbuilder.py:889 msgid "don't install packages after building" msgstr "nie instaluje pakietów po zbudowaniu" -#: pkgbuilder.py:896 +#: pkgbuilder.py:892 msgid "" "don't check if packages were installed after build" msgstr "nie sprawdza czy pakiety zostały zainstalowane po zbudowaniu" -#: pkgbuilder.py:899 +#: pkgbuilder.py:895 msgid "pacman syntax compatiblity" msgstr "kompatybilność ze składnią pacmana" -#: pkgbuilder.py:901 +#: pkgbuilder.py:897 msgid "pacman syntax compatiblity" msgstr "kompatybilność ze składnią pacmana" -#: pkgbuilder.py:904 +#: pkgbuilder.py:900 msgid "view package information" msgstr "wyświetla informację o pakiecie" -#: pkgbuilder.py:906 +#: pkgbuilder.py:902 msgid "search the AUR for matching strings" msgstr "przeszukuje AUR według pasujących ciągów" -#: pkgbuilder.py:910 +#: pkgbuilder.py:906 msgid "upgrade installed AUR packages" msgstr "uaktualnia zainstalowane pakiety z AUR" -#: pkgbuilder.py:913 +#: pkgbuilder.py:909 msgid "chooses protocol (default: http)" msgstr "wybiera protokół (domyślnie: http)" -#: pkgbuilder.py:935 +#: pkgbuilder.py:931 msgid "Package {0} not found." msgstr "Nie znaleziono pakietu {0}." #. TRANSLATORS: space it properly. `yes/no' below are #. for `out of date'. -#: pkgbuilder.py:939 +#: pkgbuilder.py:935 msgid "" "Category : {cat}\n" "Name : {nme}\n" @@ -253,25 +253,25 @@ msgstr "" "Ost. aktualiz. : {upd}\n" "Opis : {dsc}\n" -#: pkgbuilder.py:956 +#: pkgbuilder.py:952 msgid "yes" msgstr "tak" -#: pkgbuilder.py:957 +#: pkgbuilder.py:953 msgid "no" msgstr "nie" #. this would be too many entries. The API is really #. having this limitation, though. -#: pkgbuilder.py:972 +#: pkgbuilder.py:968 msgid "[ERR5002] search string too short, API limitation" msgstr "[ERR5002] ciąg zbyt krótki, limitacja API" -#: pkgbuilder.py:974 +#: pkgbuilder.py:970 msgid "Searching for exact match…" msgstr "Szukanie dokładnego dopasowania..." -#: pkgbuilder.py:977 INSTALL.py:62 INSTALL.py:71 INSTALL.py:80 INSTALL.py:89 +#: pkgbuilder.py:973 INSTALL.py:62 INSTALL.py:71 INSTALL.py:80 INSTALL.py:89 msgid "not found" msgstr "nie znaleziono" @@ -297,7 +297,7 @@ msgid "" msgstr "" "\n" "\n" -"Coś się popsuło. Przeczytaj to, co wypisał makepkg i spróbuj ponownie.\n" +"Coś poszło źle. Przeczytaj wyjście makepkg i spróbuj ponownie.\n" "Możesz też próbować debugować pracę tego skryptu samemu.\n" "Wszystkie pliki, nad którymi ten skrypt pracował, znajdują się w\n" " {0}\n" @@ -390,3 +390,6 @@ msgstr "" "\n" "Jeśli to jest to, co chcesz zrobić, proszę bardzo. Jeśli nie,\n" "uruchom ten skrypt jeszcze raz." + +#~ msgid "[ERR3301] makepkg returned 1." +#~ msgstr "[ERR3301] makepkg zwrócił 1." diff --git a/messages.pot b/messages.pot index 8a51eee..2075c3e 100644 --- a/messages.pot +++ b/messages.pot @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: 2.1.2.32\n" +"Project-Id-Version: 2.1.2.33\n" "Report-Msgid-Bugs-To: Kwpolska \n" -"POT-Creation-Date: 2012-07-30 11:31+0200\n" -"PO-Revision-Date: 2012-07-30 11:31+0200\n" +"POT-Creation-Date: 2012-07-30 12:34+0200\n" +"PO-Revision-Date: 2012-07-30 12:34+0200\n" "Last-Translator: Kwpolska \n" "Language-Team: Kwpolska \n" "Language: en\n" @@ -65,165 +65,165 @@ msgid "[INF3450] validation: installed {0}" msgstr "" #: pkgbuilder.py:504 -msgid "[ERR3301] makepkg returned 1." +msgid "[ERR3402] Something went wrong. EC={0} EM={1}" msgstr "" -#: pkgbuilder.py:509 -msgid "[ERR3401] Building more AUR packages is required." +#: pkgbuilder.py:508 +msgid "[WRN3401] Building more AUR packages is required." msgstr "" -#: pkgbuilder.py:533 +#: pkgbuilder.py:532 msgid "[ERR3102] download: HTTP Error {0}" msgstr "" -#: pkgbuilder.py:536 +#: pkgbuilder.py:535 msgid "[ERR3101] download: 0 bytes downloaded" msgstr "" -#: pkgbuilder.py:559 +#: pkgbuilder.py:558 msgid "[ERR3151] extract: no files extracted" msgstr "" -#: pkgbuilder.py:642 pkgbuilder.py:706 +#: pkgbuilder.py:641 pkgbuilder.py:705 msgid "[ERR3201] depcheck: cannot find {0} anywhere" msgstr "" -#: pkgbuilder.py:670 +#: pkgbuilder.py:669 msgid "[ERR3001] Package {0} not found." msgstr "" -#: pkgbuilder.py:673 +#: pkgbuilder.py:672 msgid "Building {0}…" msgstr "" #. Okay, this package exists, great then. Thanks, user. -#: pkgbuilder.py:681 +#: pkgbuilder.py:680 msgid "Downloading the tarball…" msgstr "" -#: pkgbuilder.py:684 +#: pkgbuilder.py:683 msgid "{0} kB downloaded" msgstr "" -#: pkgbuilder.py:686 +#: pkgbuilder.py:685 msgid "Extracting…" msgstr "" -#: pkgbuilder.py:687 +#: pkgbuilder.py:686 msgid "{0} files extracted" msgstr "" -#: pkgbuilder.py:691 +#: pkgbuilder.py:690 msgid "Checking dependencies…" msgstr "" -#: pkgbuilder.py:698 +#: pkgbuilder.py:697 msgid "found in system" msgstr "" -#: pkgbuilder.py:698 +#: pkgbuilder.py:697 msgid "found in repos" msgstr "" -#: pkgbuilder.py:699 +#: pkgbuilder.py:698 msgid "found in the AUR" msgstr "" -#: pkgbuilder.py:702 +#: pkgbuilder.py:701 msgid "none found" msgstr "" -#: pkgbuilder.py:716 +#: pkgbuilder.py:715 msgid "" "[ERR3202] depcheck: UnicodeDecodeError. The PKGBUILD cannot be read. There " "are invalid UTF-8 characters (eg. in the Maintainer field.) Error message: " "{0}" msgstr "" -#: pkgbuilder.py:822 pkgbuilder.py:824 +#: pkgbuilder.py:818 pkgbuilder.py:820 msgid "Gathering data about packages…" msgstr "" -#: pkgbuilder.py:831 +#: pkgbuilder.py:827 msgid "Targets ({0}): " msgstr "" -#: pkgbuilder.py:833 +#: pkgbuilder.py:829 msgid "{0} upgradeable packages found:" msgstr "" -#: pkgbuilder.py:838 +#: pkgbuilder.py:834 msgid " there is nothing to do" msgstr "" -#: pkgbuilder.py:840 +#: pkgbuilder.py:836 msgid "there is nothing to do" msgstr "" -#: pkgbuilder.py:845 pkgbuilder.py:849 +#: pkgbuilder.py:841 pkgbuilder.py:845 msgid "Proceed with installation? [Y/n] " msgstr "" -#: pkgbuilder.py:875 +#: pkgbuilder.py:871 msgid "An AUR helper/library. Wrapper-friendly (pacman-like output.)" msgstr "" -#: pkgbuilder.py:876 +#: pkgbuilder.py:872 msgid "You can use pacman syntax if you want to." msgstr "" -#: pkgbuilder.py:882 +#: pkgbuilder.py:878 msgid "packages to build" msgstr "" -#: pkgbuilder.py:887 +#: pkgbuilder.py:883 msgid "don't use colors in output" msgstr "" -#: pkgbuilder.py:890 +#: pkgbuilder.py:886 msgid "don't check dependencies (may break makepkg)" msgstr "" -#: pkgbuilder.py:893 +#: pkgbuilder.py:889 msgid "don't install packages after building" msgstr "" -#: pkgbuilder.py:896 +#: pkgbuilder.py:892 msgid "" "don't check if packages were installed after build" msgstr "" -#: pkgbuilder.py:899 +#: pkgbuilder.py:895 msgid "pacman syntax compatiblity" msgstr "" -#: pkgbuilder.py:901 +#: pkgbuilder.py:897 msgid "pacman syntax compatiblity" msgstr "" -#: pkgbuilder.py:904 +#: pkgbuilder.py:900 msgid "view package information" msgstr "" -#: pkgbuilder.py:906 +#: pkgbuilder.py:902 msgid "search the AUR for matching strings" msgstr "" -#: pkgbuilder.py:910 +#: pkgbuilder.py:906 msgid "upgrade installed AUR packages" msgstr "" -#: pkgbuilder.py:913 +#: pkgbuilder.py:909 msgid "chooses protocol (default: http)" msgstr "" -#: pkgbuilder.py:935 +#: pkgbuilder.py:931 msgid "Package {0} not found." msgstr "" #. TRANSLATORS: space it properly. `yes/no' below are #. for `out of date'. -#: pkgbuilder.py:939 +#: pkgbuilder.py:935 msgid "" "Category : {cat}\n" "Name : {nme}\n" @@ -238,25 +238,25 @@ msgid "" "Description : {dsc}\n" msgstr "" -#: pkgbuilder.py:956 +#: pkgbuilder.py:952 msgid "yes" msgstr "" -#: pkgbuilder.py:957 +#: pkgbuilder.py:953 msgid "no" msgstr "" #. this would be too many entries. The API is really #. having this limitation, though. -#: pkgbuilder.py:972 +#: pkgbuilder.py:968 msgid "[ERR5002] search string too short, API limitation" msgstr "" -#: pkgbuilder.py:974 +#: pkgbuilder.py:970 msgid "Searching for exact match…" msgstr "" -#: pkgbuilder.py:977 INSTALL.py:62 INSTALL.py:71 INSTALL.py:80 INSTALL.py:89 +#: pkgbuilder.py:973 INSTALL.py:62 INSTALL.py:71 INSTALL.py:80 INSTALL.py:89 msgid "not found" msgstr "" diff --git a/pkgbuilder-2.1.2.32.tar.gz b/pkgbuilder-2.1.2.32.tar.gz deleted file mode 100644 index 430982d..0000000 Binary files a/pkgbuilder-2.1.2.32.tar.gz and /dev/null differ diff --git a/pkgbuilder.py b/pkgbuilder.py index 4721296..e6571cd 100755 --- a/pkgbuilder.py +++ b/pkgbuilder.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 # -*- encoding: utf-8 -*- -# PKGBUILDer v2.1.2.32 +# PKGBUILDer v2.1.2.33 # An AUR helper/library. # Copyright (C) 2011-2012, Kwpolska. # All rights reserved. @@ -52,7 +52,7 @@ import functools import logging -VERSION = '2.1.2.32' +VERSION = '2.1.2.33' T = gettext.translation('pkgbuilder', '/usr/share/locale', fallback='C') _ = T.gettext @@ -474,7 +474,7 @@ def auto_build(self, pkgname, validate=True, performdepcheck=True, :Returns: nothing. :Exceptions: PBError. :Message codes: - ERR3301, ERR34?? (ERR3401, ERR3450, ERR3451, ERR3452), INF3450. + WRN3401, ERR3402, INF3450, ERR3451, ERR3452. :Former data: 2.0 Name: build.""" build_result = self.build_runner(pkgname, performdepcheck, @@ -501,12 +501,11 @@ def auto_build(self, pkgname, validate=True, performdepcheck=True, installed {0}').format(pkg.version)) elif build_result[0] >= 0 and build_result[0] <= 15: os.chdir('../') - raise PBError(_('[ERR3301] makepkg returned 1.')) - # I think that only makepkg can do that. Others would - # raise an exception. + raise PBError(_('[ERR3402] Something went wrong. \ +EC={0} EM={1}').format(build_result[0], build_result[1])) elif build_result[0] == 16: os.chdir('../') - fancy_warning(_('[ERR3401] Building more AUR packages is \ + fancy_warning(_('[WRN3401] Building more AUR packages is \ required.')) for pkgname2 in build_result[1]: self.auto_build(pkgname2, validate, performdepcheck, @@ -570,7 +569,7 @@ def prepare_deps(self, pkgbuild): :Exceptions: IOError. :Message codes: none.""" fixedp = '0123456789abcdefghijklmnopqrstuvwxyz\ -ABCDEFGHIJKLMNOPQRSTUVWXYZ!#$%&* + ,-./:;<=>?@[]^_`{|}~"\'' +ABCDEFGHIJKLMNOPQRSTUVWXYZ!#$%&*+,-./:;<=>?@[]^_`{|}~"\'' pattern1 = 'depends=(' + OneOrMore(Word(fixedp)) + ')' pattern2 = 'makedepends=(' + OneOrMore(Word(fixedp)) + ')' @@ -635,7 +634,7 @@ def depcheck(self, depends): parseddeps[dep] = 0 elif pyalpm.find_satisfier(syncpkgs, dep): parseddeps[dep] = 1 - elif self.utils.info(dep) is not None: + elif self.utils.info(dep) != None: parseddeps[dep] = 2 else: parseddeps[dep] = -1 @@ -727,9 +726,6 @@ def build_runner(self, pkgname, performdepcheck=True, return [subprocess.call('/usr/bin/makepkg -s' + mpparams, shell=True), 'makepkg'] - # In version 2.0, this comment couldn't believe that - # the main function takes only one line. But, right now, - # it doesn't think so. Others look like it, too. except PBError as inst: fancy_error(str(inst)) return [3, ['pb']] diff --git a/release b/release index cc5e533..6dd9523 100755 --- a/release +++ b/release @@ -62,40 +62,30 @@ for i in ./locale/*; do sed 's/\"Project-Id-Version: .*/\"Project-Id-Version: $version\\n\"/' $popath -i msgmerge $popath messages.pot -o $popath fuzzy=$(cat $popath | grep '#, fuzzy') - if [[ $fuzzy != '' ]]; then - echo "Notice: language $language has fuzzy strings. Press any key to validate." - read validatesure - if [[ $EDITOR == 'vim' ]]; then - vim $popath -c '/#, fuzzy' - else - $EDITOR $popath - fi - fi + echo "Please press a key to validate language $language." + read validatesure + $EDITOR $popath msgfmt -o $podir/pkgbuilder.mo $popath done ./setup.py sdist upload -opwd=$(pwd) -pbdir="/tmp/$project-pkgbuild-$version" -mkdir -p $pbdir -cp PKGBUILD $pbdir -cd $pbdir -makepkg -cg > $pbdir/md5sums -md5out=$(cat $pbdir/md5sums) -cd $opwd -sed "s/md5sums=.*/$md5out/" PKGBUILD -i -cp PKGBUILD $pbdir -cd $pbdir -makepkg -f --source -aurupload Kwpolska - $aurcat $pbdir/*.src.tar.gz -cd $opwd +md5out=$(md5sum 'dist/'$project'-'$version'.tar.gz'|awk '{print $1}') +sed "s/md5sums=.*/md5sums=('$md5out')/" PKGBUILD -i +rm -rf MKPKGBUILD +mkdir -p MKPKGBUILD/$project +cp PKGBUILD MKPKGBUILD/$project +cd MKPKGBUILD +tar -czvf pkgbuilder.src.tar.gz pkgbuilder +burp -u Kwpolska -c system pkgbuilder.src.tar.gz +cd .. +rm -rf MKPKGBUILD echo 'Commit message (sans the version?)' echo -n '> ' read commitmsg -rm -rf pkgbuilder.egg-info +rm -rf pkgbuilder.egg-info __pycache__ git add * git commit -asm "v$version: $commitmsg" diff --git a/setup.py b/setup.py index cb63b27..f423e08 100755 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup setup(name='pkgbuilder', - version='2.1.2.32', + version='2.1.2.33', description='An AUR helper (and library) in python3', author='Kwpolska', author_email='kwpolska@kwpolska.tk',