diff --git a/.pbwrapperhelp b/.pbwrapperhelp index 750b9e9..82870d6 100644 --- a/.pbwrapperhelp +++ b/.pbwrapperhelp @@ -1,79 +1,3 @@ -usage: pacman [...] -operations: - pacman {-h --help} - pacman {-V --version} - pacman {-D --database} - pacman {-Q --query} [options] [package(s)] - pacman {-R --remove} [options] - pacman {-S --sync} [options] [package(s)] - pacman {-T --deptest} [options] [package(s)] - pacman {-U --upgrade} [options] - -use 'pacman {-h --help}' with an operation for available options -usage: pacman {-D --database} -options: - -b, --dbpath set an alternate database location - -r, --root set an alternate installation root - -v, --verbose be verbose - --arch set an alternate architecture - --asdeps mark packages as non-explicitly installed - --asexplicit mark packages as explicitly installed - --cachedir set an alternate package cache location - --config set an alternate configuration file - --debug display debug messages - --gpgdir set an alternate home directory for GnuPG - --logfile set an alternate log file - --noconfirm do not ask for any confirmation -usage: pacman {-Q --query} [options] [package(s)] -options: - -b, --dbpath set an alternate database location - -c, --changelog view the changelog of a package - -d, --deps list packages installed as dependencies [filter] - -e, --explicit list packages explicitly installed [filter] - -g, --groups view all members of a package group - -i, --info view package information (-ii for backup files) - -k, --check check that the files owned by the package(s) are present - -l, --list list the contents of the queried package - -m, --foreign list installed packages not found in sync db(s) [filter] - -o, --owns query the package that owns - -p, --file query a package file instead of the database - -q, --quiet show less information for query and search - -r, --root set an alternate installation root - -s, --search search locally-installed packages for matching strings - -t, --unrequired list packages not required by any package [filter] - -u, --upgrades list outdated packages [filter] - -v, --verbose be verbose - --arch set an alternate architecture - --cachedir set an alternate package cache location - --config set an alternate configuration file - --debug display debug messages - --gpgdir set an alternate home directory for GnuPG - --logfile set an alternate log file - --noconfirm do not ask for any confirmation -usage: pacman {-R --remove} [options] -options: - -b, --dbpath set an alternate database location - -c, --cascade remove packages and all packages that depend on them - -d, --nodeps skip dependency version checks (-dd to skip all checks) - -n, --nosave remove configuration files - -p, --print print the targets instead of performing the operation - -r, --root set an alternate installation root - -s, --recursive remove unnecessary dependencies - (-ss includes explicitly installed dependencies) - -u, --unneeded remove unneeded packages - -v, --verbose be verbose - --arch set an alternate architecture - --cachedir set an alternate package cache location - --config set an alternate configuration file - --dbonly only modify database entries, not package files - --debug display debug messages - --gpgdir set an alternate home directory for GnuPG - --logfile set an alternate log file - --noconfirm do not ask for any confirmation - --noprogressbar do not show a progress bar when downloading files - --noscriptlet do not execute the install scriptlet if one exists - --print-format - specify how the targets should be printed usage: pacman {-S --sync} [options] [package(s)] options: -b, --dbpath set an alternate database location @@ -109,41 +33,31 @@ options: --noscriptlet do not execute the install scriptlet if one exists --print-format specify how the targets should be printed -usage: pacman {-T --deptest} [options] [package(s)] -options: - -b, --dbpath set an alternate database location - -r, --root set an alternate installation root - -v, --verbose be verbose - --arch set an alternate architecture - --cachedir set an alternate package cache location - --config set an alternate configuration file - --debug display debug messages - --gpgdir set an alternate home directory for GnuPG - --logfile set an alternate log file - --noconfirm do not ask for any confirmation -usage: pacman {-U --upgrade} [options] +usage: pkgbuilder [-h] [-V] [-c] [--debug] [-d] [-v] [-w] [-P PROTOCOL] [-S] + [-y] [-i] [-s] [-u] + [PACKAGE [PACKAGE ...]] + +An AUR helper (and library) in Python 3. + +positional arguments: + PACKAGE packages to build + +optional arguments: + -h, --help show this help message and exit + -V, --version show version number and quit + options: - -b, --dbpath set an alternate database location - -d, --nodeps skip dependency version checks (-dd to skip all checks) - -f, --force force install, overwrite conflicting files - -p, --print print the targets instead of performing the operation - -r, --root set an alternate installation root - -v, --verbose be verbose - --arch set an alternate architecture - --asdeps install packages as non-explicitly installed - --asexplicit install packages as explicitly installed - --cachedir set an alternate package cache location - --config set an alternate configuration file - --dbonly only modify database entries, not package files - --debug display debug messages - --gpgdir set an alternate home directory for GnuPG - --ignore ignore a package upgrade (can be used more than once) - --ignoregroup - ignore a group upgrade (can be used more than once) - --logfile set an alternate log file - --needed do not reinstall up to date packages - --noconfirm do not ask for any confirmation - --noprogressbar do not show a progress bar when downloading files - --noscriptlet do not execute the install scriptlet if one exists - --print-format - specify how the targets should be printed + -c, --nocolors don't use colors in output + --debug display debug messages + -d, --nodepcheck don't check dependencies (may break makepkg) + -v, --novalidation don't check if packages were installed after build + -w, --buildonly don't install packages after building + -P PROTOCOL, --protocol PROTOCOL + choose protocol (default: http) + -S, --sync pacman-like mode + -y, --refresh (dummy) + +operations: + -i, --info view package information + -s, --search search the AUR for matching strings + -u, --sysupgrade upgrade installed AUR packages diff --git a/INSTALL.py b/INSTALL.py index e4f264c..981e6d7 100755 --- a/INSTALL.py +++ b/INSTALL.py @@ -107,7 +107,7 @@ def install(pkgname): Something went wrong. Please read makepkg's output and try again. You can also try to debug the work of this script yourself. All the files this script was working on are placed in - {0} + {} (the number is random). If I am wrong, though, congratulations! @@ -133,7 +133,7 @@ def install(pkgname): print('') UID = os.geteuid() - PATH = '/tmp/pkgbuilderinstall-{0}'.format(random.randint(1, 100)) + PATH = '/tmp/pkgbuilderinstall-{}'.format(random.randint(1, 100)) if os.path.exists(PATH) is False: os.mkdir(PATH) os.chdir(PATH) @@ -155,7 +155,7 @@ def install(pkgname): Read the above output. If the script had any problems, run it again. You can also try to debug the work of this script yourself. All the files this script was working on are placed in - {0} + {} (the number is random). If everything went fine, though, congratulations! You can now use @@ -174,7 +174,7 @@ def install(pkgname): else: print(_("""It looks like you want to quit. Okay then, goodbye. All the files this script was working on are placed in - {0} + {} (the number is random). If that's what you want to do, go for it. If it isn't, run this diff --git a/MANIFEST.in b/MANIFEST.in index 9bd2365..af39521 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -2,6 +2,8 @@ include INSTALL.py include LICENSE include README.rst include requirements.txt +include PKGBUILD +include PKGBUILD-git recursive-include docs * recursive-include bin * recursive-include pkgbuilder * diff --git a/PKGBUILD b/PKGBUILD index 92d2b14..a3df109 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Kwpolska pkgname=pkgbuilder -pkgver=2.1.4.0 +pkgver=2.1.4.1 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=('aa83d7b4f16adf2c8d64ad744f5d2590') +md5sums=('9c1a640790a10459c224d3fd94c01de9') package() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/PKGBUILD-git b/PKGBUILD-git new file mode 100644 index 0000000..71f9b8c --- /dev/null +++ b/PKGBUILD-git @@ -0,0 +1,38 @@ +# Maintainer: Kwpolska +pkgname=pkgbuilder-git +pkgver=20120908 +pkgrel=1 +pkgdesc='A Python AUR helper/library. Version from git.' +arch=('any') +url='https://github.com/Kwpolska/pkgbuilder' +license=('BSD') +depends=('python' 'pyalpm>=0.5.1-1' 'python-requests') +makedepends=('git') +options=(!emptydirs) + +_gitroot=git://github.com/Kwpolska/pkgbuilder.git +_gitname=pkgbuilder + +package() { + cd "${srcdir}" + msg "Connecting to GIT server...." + + if [[ -d "${_gitname}" ]]; then + cd "${_gitname}" && git pull origin + msg "The local files are updated." + else + git clone "${_gitroot}" "${_gitname}" + fi + + msg "GIT checkout done or server timeout" + msg "Starting build..." + + rm -rf "${srcdir}/${_gitname}-build" + git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build" + cd "${srcdir}/${_gitname}-build" + + python setup.py install --root="${pkgdir}/" --optimize=1 + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${_gitname}/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/README b/README index 4fbdc15..4210bdf 100644 --- a/README +++ b/README @@ -4,7 +4,7 @@ PKGBUILDer. An AUR helper (and library) in Python 3. :Info: This is the README file for PKGBUILDer. :Author: Kwpolska :Date: 2012-09-08 -:Version: 2.1.4.0 +:Version: 2.1.4.1 .. index: README diff --git a/README.rst b/README.rst index 4fbdc15..4210bdf 100644 --- a/README.rst +++ b/README.rst @@ -4,7 +4,7 @@ PKGBUILDer. An AUR helper (and library) in Python 3. :Info: This is the README file for PKGBUILDer. :Author: Kwpolska :Date: 2012-09-08 -:Version: 2.1.4.0 +:Version: 2.1.4.1 .. index: README diff --git a/dist/pkgbuilder-2.1.4.0.tar.gz b/dist/pkgbuilder-2.1.4.0.tar.gz deleted file mode 100644 index 4ef9e7a..0000000 Binary files a/dist/pkgbuilder-2.1.4.0.tar.gz and /dev/null differ diff --git a/dist/pkgbuilder-2.1.4.1.tar.gz b/dist/pkgbuilder-2.1.4.1.tar.gz new file mode 100644 index 0000000..e93ce47 Binary files /dev/null and b/dist/pkgbuilder-2.1.4.1.tar.gz differ diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index de11c7a..a8dc8ab 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: 2012-09-08 -:Version: 2.1.4.0 +:Version: 2.1.4.1 .. index:: CHANGELOG diff --git a/docs/LICENSE.rst b/docs/LICENSE.rst index 346bd14..65eb59d 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: 2012-09-08 -:Version: 2.1.4.0 +:Version: 2.1.4.1 .. index:: LICENSE diff --git a/docs/README.rst b/docs/README.rst index 4fbdc15..4210bdf 100644 --- a/docs/README.rst +++ b/docs/README.rst @@ -4,7 +4,7 @@ PKGBUILDer. An AUR helper (and library) in Python 3. :Info: This is the README file for PKGBUILDer. :Author: Kwpolska :Date: 2012-09-08 -:Version: 2.1.4.0 +:Version: 2.1.4.1 .. index: README diff --git a/docs/aur.rst b/docs/aur.rst index 14226d3..790375a 100644 --- a/docs/aur.rst +++ b/docs/aur.rst @@ -4,7 +4,7 @@ aur module (AUR class) :Author: Kwpolska :Copyright: See Appendix B. :Date: 2012-09-08 -:Version: 2.1.4.0 +:Version: 2.1.4.1 .. module:: aur diff --git a/docs/build.rst b/docs/build.rst index 53e50c3..ed22789 100644 --- a/docs/build.rst +++ b/docs/build.rst @@ -4,7 +4,7 @@ build module (Build class) :Author: Kwpolska :Copyright: See Appendix B. :Date: 2012-09-08 -:Version: 2.1.4.0 +:Version: 2.1.4.1 .. module:: build diff --git a/docs/conf.py b/docs/conf.py index 99539a2..ed5240a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -50,7 +50,7 @@ # The short X.Y version. version = '2.1.3' # The full version, including alpha/beta/rc tags. -release = '2.1.4.0' +release = '2.1.4.1' # 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 ef9dc08..03f82c9 100644 --- a/docs/main.rst +++ b/docs/main.rst @@ -4,7 +4,7 @@ main module :Author: Kwpolska :Copyright: See Appendix B. :Date: 2012-09-08 -:Version: 2.1.4.0 +:Version: 2.1.4.1 .. index:: main .. versionadded:: 2.1.3.0 diff --git a/docs/pb.8.gz b/docs/pb.8.gz index 3d86d90..062092d 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 9fddf03..377d730 100644 --- a/docs/pb.rst +++ b/docs/pb.rst @@ -5,7 +5,7 @@ PBWrapper :Author: Kwpolska :Copyright: See Appendix B. :Date: 2012-09-08 -:Version: 2.1.4.0 +:Version: 2.1.4.1 :Wrapper Version: 0.1.0 :Manual section: 8 :Manual group: PKGBUILDer manual diff --git a/docs/pbds.rst b/docs/pbds.rst index 302f64f..e9eadc9 100644 --- a/docs/pbds.rst +++ b/docs/pbds.rst @@ -5,7 +5,7 @@ pbds module (PBDS class) :Author: Kwpolska :Copyright: See Appendix B. :Date: 2012-09-08 -:Version: 2.1.4.0 +:Version: 2.1.4.1 .. module: pbds diff --git a/docs/pkgbuilder.8.gz b/docs/pkgbuilder.8.gz index 9f0f973..c421e1f 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 0f139ee..f432634 100644 --- a/docs/pkgbuilder.rst +++ b/docs/pkgbuilder.rst @@ -5,7 +5,7 @@ PKGBUILDer :Author: Kwpolska :Copyright: See Appendix B. :Date: 2012-09-08 -:Version: 2.1.4.0 +:Version: 2.1.4.1 :Manual section: 8 :Manual group: PKGBUILDer manual diff --git a/docs/upgrade.rst b/docs/upgrade.rst index 0ab680b..efd107d 100644 --- a/docs/upgrade.rst +++ b/docs/upgrade.rst @@ -5,7 +5,7 @@ upgrade module (Upgrade class) :Author: Kwpolska :Copyright: See Appendix B. :Date: 2012-09-08 -:Version: 2.1.4.0 +:Version: 2.1.4.1 .. module:: upgrade diff --git a/docs/utils.rst b/docs/utils.rst index 861ec4c..3ba4daf 100644 --- a/docs/utils.rst +++ b/docs/utils.rst @@ -5,7 +5,7 @@ utils module (Utils class) :Author: Kwpolska :Copyright: See Appendix B. :Date: 2012-09-08 -:Version: 2.1.4.0 +:Version: 2.1.4.1 .. module:: utils diff --git a/docs/wrapper.rst b/docs/wrapper.rst index aee8423..cdf1a50 100644 --- a/docs/wrapper.rst +++ b/docs/wrapper.rst @@ -4,7 +4,7 @@ PBWrapper :Author: Kwpolska :Copyright: See Appendix B. :Date: 2012-09-08 -:Version: 2.1.4.0 +:Version: 2.1.4.1 :PBWrapper Version: 0.1.0 .. index:: wrapper diff --git a/locale/en/LC_MESSAGES/pkgbuilder.mo b/locale/en/LC_MESSAGES/pkgbuilder.mo index a738f42..e16863a 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 938c518..82035bf 100644 --- a/locale/en/LC_MESSAGES/pkgbuilder.po +++ b/locale/en/LC_MESSAGES/pkgbuilder.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: 2.1.4.0\n" +"Project-Id-Version: 2.1.4.1\n" "Report-Msgid-Bugs-To: Kwpolska \n" -"POT-Creation-Date: 2012-09-08 11:57+0200\n" -"PO-Revision-Date: 2012-07-27 13:44+0100\n" +"POT-Creation-Date: 2012-09-08 13:02+0200\n" +"PO-Revision-Date: 2012-09-08 12:44+0100\n" "Last-Translator: Kwpolska \n" "Language-Team: Kwpolska \n" "Language: en\n" @@ -17,85 +17,78 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: pkgbuilder/aur.py:42 pkgbuilder/aur.py:59 -#, fuzzy -msgid "AUR: HTTP Error {0}" -msgstr "[ERR1001] AUR: HTTP Error {0}" +msgid "AUR: HTTP Error {}" +msgstr "AUR: HTTP Error {}" #: pkgbuilder/build.py:56 msgid "The build function reported a proper build." msgstr "The build function reported a proper build." #: pkgbuilder/build.py:64 -#, fuzzy msgid "validation: NOT installed" -msgstr "[ERR3451] validation: NOT installed" +msgstr "validation: NOT installed" -#: pkgbuilder/build.py:68 -#, fuzzy -msgid "validation: outdated {0}" -msgstr "[ERR3452] validation: outdated {0}" +#: pkgbuilder/build.py:67 +msgid "validation: outdated {}" +msgstr "validation: outdated {}" -#: pkgbuilder/build.py:71 -#, fuzzy -msgid "validation: installed {0}" -msgstr "[INF3450] validation: installed {0}" +#: pkgbuilder/build.py:70 +msgid "validation: installed {}" +msgstr "validation: installed {}" #. PBxxx. -#: pkgbuilder/build.py:74 +#: pkgbuilder/build.py:73 msgid "makepkg (or someone else) failed and returned {}." -msgstr "" +msgstr "makepkg (or someone else) failed and returned {}." #. PBSUX. -#: pkgbuilder/build.py:78 +#: pkgbuilder/build.py:77 msgid "PKGBUILDer had a problem." -msgstr "" +msgstr "PKGBUILDer had a problem." #. PBREQ. +#. TRANSLATORS: do not translate the word 'requests'. #: pkgbuilder/build.py:81 msgid "" -"PKGBUILDer (or the requests library) hadproblems with fulfilling an HTTP " +"PKGBUILDer (or the requests library) had problems with fulfilling an HTTP " "request." msgstr "" +"PKGBUILDer (or the requests library) had problems with fulfilling an HTTP " +"request." #. I/O error. #: pkgbuilder/build.py:85 msgid "There was an input/output error." -msgstr "" +msgstr "There was an input/output error." #. PBDEP. #: pkgbuilder/build.py:88 -#, fuzzy msgid "Building more AUR packages is required." -msgstr "[WRN3401] Building more AUR packages is required." +msgstr "Building more AUR packages is required." #: pkgbuilder/build.py:111 -#, fuzzy -msgid "download: HTTP Error {0}" -msgstr "[ERR3102] download: HTTP Error {0}" +msgid "download: HTTP Error {}" +msgstr "download: HTTP Error {}" #: pkgbuilder/build.py:114 -#, fuzzy msgid "download: 0 bytes downloaded" -msgstr "[ERR3101] download: 0 bytes downloaded" +msgstr "download: 0 bytes downloaded" #: pkgbuilder/build.py:137 -#, fuzzy msgid "extract: no files extracted" -msgstr "[ERR3151] extract: no files extracted" +msgstr "extract: no files extracted" #: pkgbuilder/build.py:210 -#, fuzzy -msgid "depcheck: cannot find {0} anywhere" -msgstr "[ERR3201] depcheck: cannot find {0} anywhere" +msgid "depcheck: cannot find {} anywhere" +msgstr "depcheck: cannot find {} anywhere" #: pkgbuilder/build.py:235 -#, fuzzy -msgid "Package {0} not found." -msgstr "Package not found." +msgid "Package {} not found." +msgstr "Package {} not found." #: pkgbuilder/build.py:237 -msgid "Building {0}..." -msgstr "Building {0}..." +msgid "Building {}..." +msgstr "Building {}..." #. Okay, this package exists, great then. Thanks, user. #: pkgbuilder/build.py:246 @@ -103,16 +96,16 @@ msgid "Downloading the tarball..." msgstr "Downloading the tarball..." #: pkgbuilder/build.py:249 -msgid "{0} kB downloaded" -msgstr "{0} kB downloaded" +msgid "{} kB downloaded" +msgstr "{} kB downloaded" #: pkgbuilder/build.py:251 msgid "Extracting..." msgstr "Extracting..." #: pkgbuilder/build.py:252 -msgid "{0} files extracted" -msgstr "{0} files extracted" +msgid "{} files extracted" +msgstr "{} files extracted" #: pkgbuilder/build.py:257 msgid "Checking dependencies..." @@ -135,8 +128,8 @@ msgid "none found" msgstr "none found" #: pkgbuilder/main.py:32 -msgid "An AUR helper (and library) in Python 3." -msgstr "An AUR helper (and library) in Python 3." +msgid "An AUR helper (and library) in Python 3." +msgstr "An AUR helper (and library) in Python 3." #: pkgbuilder/main.py:37 msgid "show version number and quit" @@ -155,80 +148,72 @@ msgid "operations" msgstr "operations" #: pkgbuilder/main.py:45 -msgid "don't use colors in output" -msgstr "don't use colors in output" +msgid "don't use colors in output" +msgstr "don't use colors in output" #: pkgbuilder/main.py:48 msgid "display debug messages" msgstr "display debug messages" #: pkgbuilder/main.py:50 -msgid "" -"don't check dependencies (may break makepkg)" -msgstr "" -"don't check dependencies (may break makepkg)" +msgid "don't check dependencies (may break makepkg)" +msgstr "don't check dependencies (may break makepkg)" #: pkgbuilder/main.py:53 -msgid "" -"don't check if packages were installed after " -"build" -msgstr "" -"don't check if packages were installed after " -"build" +msgid "don't check if packages were installed after build" +msgstr "don't check if packages were installed after build" #: pkgbuilder/main.py:56 -msgid "don't install packages after building" -msgstr "don't install packages after building" +msgid "don't install packages after building" +msgstr "don't install packages after building" #: pkgbuilder/main.py:60 msgid "PROTOCOL" msgstr "PROTOCOL" #: pkgbuilder/main.py:60 -msgid "choose protocol (default: http)" -msgstr "choose protocol (default: http)" +msgid "choose protocol (default: http)" +msgstr "choose protocol (default: http)" #: pkgbuilder/main.py:63 -msgid "pacman-like mode (/tmp/ build, aur/ in -s)" -msgstr "pacman-like mode (/tmp/ build, aur/ in -s)" +msgid "pacman-like mode" +msgstr "pacman-like mode" -#: pkgbuilder/main.py:66 +#: pkgbuilder/main.py:65 msgid "(dummy)" msgstr "(dummy)" -#: pkgbuilder/main.py:69 +#: pkgbuilder/main.py:67 msgid "view package information" msgstr "view package information" -#: pkgbuilder/main.py:71 -msgid "search the AUR for matching strings" -msgstr "search the AUR for matching strings" +#: pkgbuilder/main.py:69 +msgid "search the AUR for matching strings" +msgstr "search the AUR for matching strings" -#: pkgbuilder/main.py:75 +#: pkgbuilder/main.py:73 msgid "upgrade installed AUR packages" msgstr "upgrade installed AUR packages" #. this would be too many entries, but this is an actual API #. limitation and not an idea of yours truly. -#: pkgbuilder/main.py:116 -#, fuzzy -msgid "search string too short, API limitation" -msgstr "[ERR5002] search string too short, API limitation" +#: pkgbuilder/main.py:113 +msgid "Search query too short, API limitation" +msgstr "Search query too short, API limitation" -#: pkgbuilder/main.py:117 +#: pkgbuilder/main.py:114 msgid "Searching for exact match..." msgstr "Searching for exact match..." -#: pkgbuilder/main.py:120 INSTALL.py:65 INSTALL.py:74 INSTALL.py:83 +#: pkgbuilder/main.py:117 INSTALL.py:65 INSTALL.py:74 INSTALL.py:83 msgid "not found" msgstr "not found" #: pkgbuilder/pbds.py:50 -#, fuzzy msgid "Aborted by user! Quitting..." -msgstr "[ERR5001] Aborted by user! Quitting..." +msgstr "Aborted by user! Quitting..." -#: pkgbuilder/pbds.py:70 pkgbuilder/pbds.py:205 +#: pkgbuilder/pbds.py:70 pkgbuilder/pbds.py:206 msgid "ERROR:" msgstr "ERROR:" @@ -236,7 +221,7 @@ msgstr "ERROR:" msgid "Cannot create the configuration directory." msgstr "Cannot create the configuration directory." -#: pkgbuilder/pbds.py:72 pkgbuilder/pbds.py:177 pkgbuilder/pbds.py:191 +#: pkgbuilder/pbds.py:72 pkgbuilder/pbds.py:178 pkgbuilder/pbds.py:192 msgid "WARNING:" msgstr "WARNING:" @@ -249,12 +234,12 @@ msgid "Gathering data about packages..." msgstr "Gathering data about packages..." #: pkgbuilder/upgrade.py:103 -msgid "Targets ({0}): " -msgstr "Targets ({0}): " +msgid "Targets ({}): " +msgstr "Targets ({}): " #: pkgbuilder/upgrade.py:105 -msgid "{0} upgradeable packages found:" -msgstr "{0} upgradeable packages found:" +msgid "{} upgradeable packages found:" +msgstr "{} upgradeable packages found:" #: pkgbuilder/upgrade.py:110 msgid " there is nothing to do" @@ -269,8 +254,8 @@ msgid "Proceed with installation? [Y/n] " msgstr "Proceed with installation? [Y/n] " #: pkgbuilder/utils.py:107 -msgid " [installed: {0}]" -msgstr " [installed: {0}]" +msgid " [installed: {}]" +msgstr " [installed: {}]" #: pkgbuilder/utils.py:109 msgid " [installed]" @@ -290,7 +275,7 @@ msgstr "Package not found." #. TRANSLATORS: space it properly. `yes/no' below are #. for `out of date'. -#: pkgbuilder/utils.py:186 +#: pkgbuilder/utils.py:192 msgid "" "Repository : aur\n" "Category : {cat}\n" @@ -318,32 +303,32 @@ msgstr "" "Last Updated : {upd}\n" "Description : {dsc}\n" -#: pkgbuilder/utils.py:204 +#: pkgbuilder/utils.py:210 msgid "yes" msgstr "yes" -#: pkgbuilder/utils.py:205 +#: pkgbuilder/utils.py:211 msgid "no" msgstr "no" #. TRANSLATORS: Note the double space, which is present in #. pacman itself. Please consult your pacman localization #. for details. -#: pkgbuilder/wrapper.py:84 +#: pkgbuilder/wrapper.py:87 #, python-format msgid "%(prog)s [...]" msgstr "%(prog)s [...]" #. TRANSLATORS: see pacman’s localizations -#: pkgbuilder/wrapper.py:217 +#: pkgbuilder/wrapper.py:220 msgid "usage: {} [...]" msgstr "usage: {} [...]" -#: pkgbuilder/wrapper.py:219 +#: pkgbuilder/wrapper.py:222 msgid "{}, a wrapper for pacman and PKGBUILDer." msgstr "{}, a wrapper for pacman and PKGBUILDer." -#: pkgbuilder/wrapper.py:221 +#: pkgbuilder/wrapper.py:224 msgid "" "Pacman and PKGBUILDer syntaxes apply. Consult their manpages/help commands " "for details." @@ -366,7 +351,7 @@ msgid "" "Something went wrong. Please read makepkg's output and try again.\n" "You can also try to debug the work of this script yourself.\n" "All the files this script was working on are placed in\n" -" {0}\n" +" {}\n" "(the number is random).\n" "\n" "If I am wrong, though, congratulations!\n" @@ -376,7 +361,7 @@ msgstr "" "Something went wrong. Please read makepkg's output and try again.\n" "You can also try to debug the work of this script yourself.\n" "All the files this script was working on are placed in\n" -" {0}\n" +" {}\n" "(the number is random).\n" "\n" "If I am wrong, though, congratulations!\n" @@ -414,7 +399,7 @@ msgid "" "Read the above output. If the script had any problems, run it\n" "again. You can also try to debug the work of this script yourself.\n" "All the files this script was working on are placed in\n" -" {0}\n" +" {}\n" "(the number is random).\n" "\n" "If everything went fine, though, congratulations! You can now use\n" @@ -427,7 +412,7 @@ msgstr "" "Read the above output. If the script had any problems, run it\n" "again. You can also try to debug the work of this script yourself.\n" "All the files this script was working on are placed in\n" -" {0}\n" +" {}\n" "(the number is random).\n" "\n" "If everything went fine, though, congratulations! You can now use\n" @@ -453,7 +438,7 @@ msgstr "" msgid "" "It looks like you want to quit. Okay then, goodbye.\n" "All the files this script was working on are placed in\n" -" {0}\n" +" {}\n" "(the number is random).\n" "\n" "If that's what you want to do, go for it. If it isn't, run this\n" @@ -461,7 +446,7 @@ msgid "" msgstr "" "It looks like you want to quit. Okay then, goodbye.\n" "All the files this script was working on are placed in\n" -" {0}\n" +" {}\n" "(the number is random).\n" "\n" "If that's what you want to do, go for it. If it isn't, run this\n" @@ -483,18 +468,3 @@ msgstr "optional arguments" #: localeprovider.py:2 msgid "show this help message and exit" msgstr "show this help message and quit" - -#~ msgid "[ERR3402] Something went wrong. EC={0} EM={1}" -#~ msgstr "[ERR3402] Something went wrong. EC={0} EM={1}" - -#~ msgid "[ERR3001] Package {0} not found." -#~ msgstr "[ERR3001] Package {0} not found." - -#~ 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}" diff --git a/locale/pl/LC_MESSAGES/pkgbuilder.mo b/locale/pl/LC_MESSAGES/pkgbuilder.mo index 43366e7..a99afea 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 7fdb32d..e2a2c7f 100644 --- a/locale/pl/LC_MESSAGES/pkgbuilder.po +++ b/locale/pl/LC_MESSAGES/pkgbuilder.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: 2.1.4.0\n" +"Project-Id-Version: 2.1.4.1\n" "Report-Msgid-Bugs-To: Kwpolska \n" -"POT-Creation-Date: 2012-09-04 20:49+0200\n" -"PO-Revision-Date: 2012-07-27 14:20+0100\n" +"POT-Creation-Date: 2012-09-08 13:02+0200\n" +"PO-Revision-Date: 2012-09-08 12:44+0100\n" "Last-Translator: Kwpolska \n" "Language-Team: Kwpolska \n" "Language: en\n" @@ -17,105 +17,120 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: pkgbuilder/aur.py:42 pkgbuilder/aur.py:59 -msgid "[ERR1001] AUR: HTTP Error {0}" -msgstr "[ERR1001] AUR: Błąd HTTP {0}" +msgid "AUR: HTTP Error {}" +msgstr "AUR: Błąd HTTP {}" -#: pkgbuilder/build.py:57 +#: pkgbuilder/build.py:56 msgid "The build function reported a proper build." msgstr "Funkcja budowania paczek powiadomiła o prawidłowym zbudowaniu." -#: pkgbuilder/build.py:66 -msgid "[ERR3451] validation: NOT installed" -msgstr "[ERR3451] walidacja: NIE zainstalowano" +#: pkgbuilder/build.py:64 +msgid "validation: NOT installed" +msgstr "walidacja: NIE zainstalowano" + +#: pkgbuilder/build.py:67 +msgid "validation: outdated {}" +msgstr "walidacja: nieaktualny {}" #: pkgbuilder/build.py:70 -msgid "[ERR3452] validation: outdated {0}" -msgstr "[ERR3452] walidacja: nieaktualne {0}" +msgid "validation: installed {}" +msgstr "walidacja: zainstalowany {}" +#. PBxxx. #: pkgbuilder/build.py:73 -msgid "[INF3450] validation: installed {0}" -msgstr "[INF3450] walidacja: zainstalowane {0}" +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:77 -msgid "[ERR3402] Something went wrong. EC={0} EM={1}" -msgstr "[ERR3402] Coś poszło źle. EC={0} EM={1}" +msgid "PKGBUILDer had a problem." +msgstr "PKGBUILDer miał problem." +#. PBREQ. +#. TRANSLATORS: do not translate the word 'requests'. #: pkgbuilder/build.py:81 -msgid "[WRN3401] Building more AUR packages is required." -msgstr "[ERR3401] Należy zainstalować więcej pakietów z AUR." +msgid "" +"PKGBUILDer (or the requests library) had problems with fulfilling an HTTP " +"request." +msgstr "" +"PKGBUILDer (lub bliblioteka requests) miała problemy z wypełniem żądania " +"HTTP." + +#. I/O error. +#: pkgbuilder/build.py:85 +msgid "There was an input/output error." +msgstr "Wystąpił błąd wejścia/wyjścia." + +#. PBDEP. +#: pkgbuilder/build.py:88 +msgid "Building more AUR packages is required." +msgstr "Należy zainstalować więcej pakietów z AUR." -#: pkgbuilder/build.py:105 -msgid "[ERR3102] download: HTTP Error {0}" -msgstr "[ERR3102] download: Błąd HTTP {0}" +#: pkgbuilder/build.py:111 +msgid "download: HTTP Error {}" +msgstr "download: Błąd HTTP {}" -#: pkgbuilder/build.py:108 -msgid "[ERR3101] download: 0 bytes downloaded" -msgstr "[ERR3101] download: ściągnięto 0 bajtów" +#: pkgbuilder/build.py:114 +msgid "download: 0 bytes downloaded" +msgstr "download: pobrano 0 bajtów" -#: pkgbuilder/build.py:131 -msgid "[ERR3151] extract: no files extracted" -msgstr "[ERR3151] extract: wypakowano 0 plików" +#: pkgbuilder/build.py:137 +msgid "extract: no files extracted" +msgstr "extract: wypakowano 0 plików" -#: pkgbuilder/build.py:206 pkgbuilder/build.py:265 -msgid "[ERR3201] depcheck: cannot find {0} anywhere" -msgstr "[ERR3201] depcheck: nie można nigdzie znaleźć pakietu {0}" +#: pkgbuilder/build.py:210 +msgid "depcheck: cannot find {} anywhere" +msgstr "depcheck: nie można nigdzie znaleźć pakietu {}" -#: pkgbuilder/build.py:231 -msgid "[ERR3001] Package {0} not found." -msgstr "[ERR3001] Nie znaleziono pakietu {0}." +#: pkgbuilder/build.py:235 +msgid "Package {} not found." +msgstr "Nie znaleziono pakietu {}." -#: pkgbuilder/build.py:234 -msgid "Building {0}..." -msgstr "Budowanie {0}..." +#: pkgbuilder/build.py:237 +msgid "Building {}..." +msgstr "Budowanie {}..." #. Okay, this package exists, great then. Thanks, user. -#: pkgbuilder/build.py:243 +#: pkgbuilder/build.py:246 msgid "Downloading the tarball..." -msgstr "Ściąganie tarballa..." +msgstr "Pobieranie tarballa..." -#: pkgbuilder/build.py:246 -msgid "{0} kB downloaded" -msgstr "ściągnięto {0} kB" +#: pkgbuilder/build.py:249 +msgid "{} kB downloaded" +msgstr "pobrano {} kB" -#: pkgbuilder/build.py:248 +#: pkgbuilder/build.py:251 msgid "Extracting..." msgstr "Wypakowywanie..." -#: pkgbuilder/build.py:249 -msgid "{0} files extracted" -msgstr "wypakowano {0} plików" +#: pkgbuilder/build.py:252 +msgid "{} files extracted" +msgstr "wypakowano {} plików" -#: pkgbuilder/build.py:253 +#: pkgbuilder/build.py:257 msgid "Checking dependencies..." msgstr "Sprawdzanie zależności..." -#: pkgbuilder/build.py:257 +#: pkgbuilder/build.py:260 msgid "found in system" msgstr "znaleziono w systemie" -#: pkgbuilder/build.py:257 +#: pkgbuilder/build.py:260 msgid "found in repos" msgstr "znaleziono w repozytoriach" -#: pkgbuilder/build.py:258 +#: pkgbuilder/build.py:261 msgid "found in the AUR" msgstr "znaleziono w AUR" -#: pkgbuilder/build.py:261 +#: pkgbuilder/build.py:264 msgid "none found" msgstr "brak" -#: pkgbuilder/build.py:275 -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}" - #: pkgbuilder/main.py:32 -msgid "An AUR helper (and library) in Python 3." +msgid "An AUR helper (and library) in Python 3." msgstr "Pomocnik AUR (i biblioteka) w Pythonie 3." #: pkgbuilder/main.py:37 @@ -135,7 +150,7 @@ msgid "operations" msgstr "operacje" #: pkgbuilder/main.py:45 -msgid "don't use colors in output" +msgid "don't use colors in output" msgstr "nie używa kolorów na wyjściu" #: pkgbuilder/main.py:48 @@ -143,18 +158,15 @@ msgid "display debug messages" msgstr "pokazuje wiadomości debugowania" #: pkgbuilder/main.py:50 -msgid "" -"don't check dependencies (may break makepkg)" +msgid "don't check dependencies (may break makepkg)" msgstr "nie sprawdza zależności (może popsuć makepkg)" #: pkgbuilder/main.py:53 -msgid "" -"don't check if packages were installed after " -"build" +msgid "don't check if packages were installed after build" msgstr "nie sprawdza czy pakiety zostały zainstalowane po zbudowaniu" #: pkgbuilder/main.py:56 -msgid "don't install packages after building" +msgid "don't install packages after building" msgstr "nie instaluje pakietów po zbudowaniu" #: pkgbuilder/main.py:60 @@ -162,48 +174,48 @@ msgid "PROTOCOL" msgstr "PROTOKÓŁ" #: pkgbuilder/main.py:60 -msgid "choose protocol (default: http)" +msgid "choose protocol (default: http)" msgstr "wybiera protokół (domyślnie: http)" #: pkgbuilder/main.py:63 -msgid "pacman-like mode (/tmp/ build, aur/ in -s)" -msgstr "tryb podobny do pacmana (budowanie w /tmp, aur/ w -s)" +msgid "pacman-like mode" +msgstr "tryb podobny do pacmana" -#: pkgbuilder/main.py:66 +#: pkgbuilder/main.py:65 msgid "(dummy)" msgstr "(dummy)" -#: pkgbuilder/main.py:69 +#: pkgbuilder/main.py:67 msgid "view package information" msgstr "wyświetla informację o pakiecie" -#: pkgbuilder/main.py:71 -msgid "search the AUR for matching strings" +#: pkgbuilder/main.py:69 +msgid "search the AUR for matching strings" msgstr "przeszukuje AUR według pasujących ciągów" -#: pkgbuilder/main.py:75 +#: pkgbuilder/main.py:73 msgid "upgrade installed AUR packages" msgstr "uaktualnia zainstalowane pakiety z AUR" #. this would be too many entries, but this is an actual API #. limitation and not an idea of yours truly. -#: pkgbuilder/main.py:116 -msgid "[ERR5002] search string too short, API limitation" -msgstr "[ERR5002] ciąg zbyt krótki, limitacja API" +#: pkgbuilder/main.py:113 +msgid "Search query too short, API limitation" +msgstr "zapytanie do wyszukiwarki zbyt krótkie, limitacja API" -#: pkgbuilder/main.py:118 +#: pkgbuilder/main.py:114 msgid "Searching for exact match..." msgstr "Szukanie dokładnego dopasowania..." -#: pkgbuilder/main.py:121 INSTALL.py:65 INSTALL.py:74 INSTALL.py:83 +#: pkgbuilder/main.py:117 INSTALL.py:65 INSTALL.py:74 INSTALL.py:83 msgid "not found" msgstr "nie znaleziono" #: pkgbuilder/pbds.py:50 -msgid "[ERR5001] Aborted by user! Quitting..." -msgstr "[ERR5001] Przerwane przez użytkownika! Kończenie..." +msgid "Aborted by user! Quitting..." +msgstr "Przerwane przez użytkownika! Kończenie..." -#: pkgbuilder/pbds.py:70 pkgbuilder/pbds.py:205 +#: pkgbuilder/pbds.py:70 pkgbuilder/pbds.py:206 msgid "ERROR:" msgstr "BŁĄD:" @@ -211,7 +223,7 @@ msgstr "BŁĄD:" msgid "Cannot create the configuration directory." msgstr "Nie można utworzyć katalogu konfiguracji." -#: pkgbuilder/pbds.py:72 pkgbuilder/pbds.py:177 pkgbuilder/pbds.py:191 +#: pkgbuilder/pbds.py:72 pkgbuilder/pbds.py:178 pkgbuilder/pbds.py:192 msgid "WARNING:" msgstr "UWAGA:" @@ -224,12 +236,12 @@ msgid "Gathering data about packages..." msgstr "Zbieranie informacji o pakietach..." #: pkgbuilder/upgrade.py:103 -msgid "Targets ({0}): " -msgstr "Cele ({0}):" +msgid "Targets ({}): " +msgstr "Cele ({}):" #: pkgbuilder/upgrade.py:105 -msgid "{0} upgradeable packages found:" -msgstr "Znaleziono {0} pakietów do aktualizacji:" +msgid "{} upgradeable packages found:" +msgstr "Znaleziono {} pakietów do aktualizacji:" #: pkgbuilder/upgrade.py:110 msgid " there is nothing to do" @@ -244,8 +256,8 @@ msgid "Proceed with installation? [Y/n] " msgstr "Kontynuować instalację? [Y/n] " #: pkgbuilder/utils.py:107 -msgid " [installed: {0}]" -msgstr " [zainstalowano: {0}]" +msgid " [installed: {}]" +msgstr " [zainstalowano: {}]" #: pkgbuilder/utils.py:109 msgid " [installed]" @@ -265,7 +277,7 @@ msgstr "Nie znaleziono pakietu." #. TRANSLATORS: space it properly. `yes/no' below are #. for `out of date'. -#: pkgbuilder/utils.py:186 +#: pkgbuilder/utils.py:192 msgid "" "Repository : aur\n" "Category : {cat}\n" @@ -293,32 +305,32 @@ msgstr "" "Ost. aktualiz. : {upd}\n" "Opis : {dsc}\n" -#: pkgbuilder/utils.py:204 +#: pkgbuilder/utils.py:210 msgid "yes" msgstr "tak" -#: pkgbuilder/utils.py:205 +#: pkgbuilder/utils.py:211 msgid "no" msgstr "nie" #. TRANSLATORS: Note the double space, which is present in #. pacman itself. Please consult your pacman localization #. for details. -#: pkgbuilder/wrapper.py:84 +#: pkgbuilder/wrapper.py:87 #, python-format msgid "%(prog)s [...]" msgstr "%(prog)s [...]" #. TRANSLATORS: see pacman’s localizations -#: pkgbuilder/wrapper.py:217 +#: pkgbuilder/wrapper.py:220 msgid "usage: {} [...]" msgstr "sposób użycia: {} [...]" -#: pkgbuilder/wrapper.py:219 +#: pkgbuilder/wrapper.py:222 msgid "{}, a wrapper for pacman and PKGBUILDer." msgstr "{}, wrapper dla pacmana i PKGBUILDera." -#: pkgbuilder/wrapper.py:221 +#: pkgbuilder/wrapper.py:224 msgid "" "Pacman and PKGBUILDer syntaxes apply. Consult their manpages/help commands " "for details." @@ -341,7 +353,7 @@ msgid "" "Something went wrong. Please read makepkg's output and try again.\n" "You can also try to debug the work of this script yourself.\n" "All the files this script was working on are placed in\n" -" {0}\n" +" {}\n" "(the number is random).\n" "\n" "If I am wrong, though, congratulations!\n" @@ -351,7 +363,7 @@ msgstr "" "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" +" {}\n" "(liczba jest losowa).\n" "\n" "Jeśli się mylę, gratulacje!\n" @@ -389,7 +401,7 @@ msgid "" "Read the above output. If the script had any problems, run it\n" "again. You can also try to debug the work of this script yourself.\n" "All the files this script was working on are placed in\n" -" {0}\n" +" {}\n" "(the number is random).\n" "\n" "If everything went fine, though, congratulations! You can now use\n" @@ -402,7 +414,7 @@ msgstr "" "Przeczytaj powyższe wyjście. Jeśli skrypt miał problemy, spróbuj\n" "jeszcze raz. Możesz też spróbować samodzielnie debugować pracę skryptu.\n" "Wszystkie pliki, nad którymi ten skrypt pracował, znajdują się w\n" -" {0}\n" +" {}\n" "(liczba jest losowa).\n" "\n" "Jeśli wszystko się udało, gratulacje! Teraz możesz używać PKGBUILDer-a.\n" @@ -428,7 +440,7 @@ msgstr "" msgid "" "It looks like you want to quit. Okay then, goodbye.\n" "All the files this script was working on are placed in\n" -" {0}\n" +" {}\n" "(the number is random).\n" "\n" "If that's what you want to do, go for it. If it isn't, run this\n" @@ -436,7 +448,7 @@ msgid "" msgstr "" "Wygląda na to, że chcesz wyjść. Okej, do widzenia.\n" "Wszystkie pliki, nad którymi ten skrypt pracował, znajdują się w\n" -" {0}\n" +" {}\n" "(liczba jest losowa).\n" "\n" "Jeśli to jest to, co chcesz zrobić, proszę bardzo. Jeśli nie,\n" diff --git a/messages.pot b/messages.pot index 23dcda7..d689fa2 100644 --- a/messages.pot +++ b/messages.pot @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: 2.1.4.0\n" +"Project-Id-Version: 2.1.4.1\n" "Report-Msgid-Bugs-To: Kwpolska \n" -"POT-Creation-Date: 2012-09-08 11:57+0200\n" -"PO-Revision-Date: 2012-09-08 11:57+0200\n" +"POT-Creation-Date: 2012-09-08 13:02+0200\n" +"PO-Revision-Date: 2012-09-08 13:02+0200\n" "Last-Translator: Kwpolska \n" "Language-Team: Kwpolska \n" "Language: en\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: pkgbuilder/aur.py:42 pkgbuilder/aur.py:59 -msgid "AUR: HTTP Error {0}" +msgid "AUR: HTTP Error {}" msgstr "" #: pkgbuilder/build.py:56 @@ -28,28 +28,29 @@ msgstr "" msgid "validation: NOT installed" msgstr "" -#: pkgbuilder/build.py:68 -msgid "validation: outdated {0}" +#: pkgbuilder/build.py:67 +msgid "validation: outdated {}" msgstr "" -#: pkgbuilder/build.py:71 -msgid "validation: installed {0}" +#: pkgbuilder/build.py:70 +msgid "validation: installed {}" msgstr "" #. PBxxx. -#: pkgbuilder/build.py:74 +#: pkgbuilder/build.py:73 msgid "makepkg (or someone else) failed and returned {}." msgstr "" #. PBSUX. -#: pkgbuilder/build.py:78 +#: pkgbuilder/build.py:77 msgid "PKGBUILDer had a problem." msgstr "" #. PBREQ. +#. TRANSLATORS: do not translate the word 'requests'. #: pkgbuilder/build.py:81 msgid "" -"PKGBUILDer (or the requests library) hadproblems with fulfilling an HTTP " +"PKGBUILDer (or the requests library) had problems with fulfilling an HTTP " "request." msgstr "" @@ -64,7 +65,7 @@ msgid "Building more AUR packages is required." msgstr "" #: pkgbuilder/build.py:111 -msgid "download: HTTP Error {0}" +msgid "download: HTTP Error {}" msgstr "" #: pkgbuilder/build.py:114 @@ -76,15 +77,15 @@ msgid "extract: no files extracted" msgstr "" #: pkgbuilder/build.py:210 -msgid "depcheck: cannot find {0} anywhere" +msgid "depcheck: cannot find {} anywhere" msgstr "" #: pkgbuilder/build.py:235 -msgid "Package {0} not found." +msgid "Package {} not found." msgstr "" #: pkgbuilder/build.py:237 -msgid "Building {0}..." +msgid "Building {}..." msgstr "" #. Okay, this package exists, great then. Thanks, user. @@ -93,7 +94,7 @@ msgid "Downloading the tarball..." msgstr "" #: pkgbuilder/build.py:249 -msgid "{0} kB downloaded" +msgid "{} kB downloaded" msgstr "" #: pkgbuilder/build.py:251 @@ -101,7 +102,7 @@ msgid "Extracting..." msgstr "" #: pkgbuilder/build.py:252 -msgid "{0} files extracted" +msgid "{} files extracted" msgstr "" #: pkgbuilder/build.py:257 @@ -125,7 +126,7 @@ msgid "none found" msgstr "" #: pkgbuilder/main.py:32 -msgid "An AUR helper (and library) in Python 3." +msgid "An AUR helper (and library) in Python 3." msgstr "" #: pkgbuilder/main.py:37 @@ -145,7 +146,7 @@ msgid "operations" msgstr "" #: pkgbuilder/main.py:45 -msgid "don't use colors in output" +msgid "don't use colors in output" msgstr "" #: pkgbuilder/main.py:48 @@ -153,18 +154,15 @@ msgid "display debug messages" msgstr "" #: pkgbuilder/main.py:50 -msgid "" -"don't check dependencies (may break makepkg)" +msgid "don't check dependencies (may break makepkg)" msgstr "" #: pkgbuilder/main.py:53 -msgid "" -"don't check if packages were installed after " -"build" +msgid "don't check if packages were installed after build" msgstr "" #: pkgbuilder/main.py:56 -msgid "don't install packages after building" +msgid "don't install packages after building" msgstr "" #: pkgbuilder/main.py:60 @@ -172,40 +170,40 @@ msgid "PROTOCOL" msgstr "" #: pkgbuilder/main.py:60 -msgid "choose protocol (default: http)" +msgid "choose protocol (default: http)" msgstr "" #: pkgbuilder/main.py:63 -msgid "pacman-like mode (/tmp/ build, aur/ in -s)" +msgid "pacman-like mode" msgstr "" -#: pkgbuilder/main.py:66 +#: pkgbuilder/main.py:65 msgid "(dummy)" msgstr "" -#: pkgbuilder/main.py:69 +#: pkgbuilder/main.py:67 msgid "view package information" msgstr "" -#: pkgbuilder/main.py:71 -msgid "search the AUR for matching strings" +#: pkgbuilder/main.py:69 +msgid "search the AUR for matching strings" msgstr "" -#: pkgbuilder/main.py:75 +#: pkgbuilder/main.py:73 msgid "upgrade installed AUR packages" msgstr "" #. this would be too many entries, but this is an actual API #. limitation and not an idea of yours truly. -#: pkgbuilder/main.py:116 -msgid "search string too short, API limitation" +#: pkgbuilder/main.py:113 +msgid "Search query too short, API limitation" msgstr "" -#: pkgbuilder/main.py:117 +#: pkgbuilder/main.py:114 msgid "Searching for exact match..." msgstr "" -#: pkgbuilder/main.py:120 INSTALL.py:65 INSTALL.py:74 INSTALL.py:83 +#: pkgbuilder/main.py:117 INSTALL.py:65 INSTALL.py:74 INSTALL.py:83 msgid "not found" msgstr "" @@ -213,7 +211,7 @@ msgstr "" msgid "Aborted by user! Quitting..." msgstr "" -#: pkgbuilder/pbds.py:70 pkgbuilder/pbds.py:205 +#: pkgbuilder/pbds.py:70 pkgbuilder/pbds.py:206 msgid "ERROR:" msgstr "" @@ -221,7 +219,7 @@ msgstr "" msgid "Cannot create the configuration directory." msgstr "" -#: pkgbuilder/pbds.py:72 pkgbuilder/pbds.py:177 pkgbuilder/pbds.py:191 +#: pkgbuilder/pbds.py:72 pkgbuilder/pbds.py:178 pkgbuilder/pbds.py:192 msgid "WARNING:" msgstr "" @@ -234,11 +232,11 @@ msgid "Gathering data about packages..." msgstr "" #: pkgbuilder/upgrade.py:103 -msgid "Targets ({0}): " +msgid "Targets ({}): " msgstr "" #: pkgbuilder/upgrade.py:105 -msgid "{0} upgradeable packages found:" +msgid "{} upgradeable packages found:" msgstr "" #: pkgbuilder/upgrade.py:110 @@ -254,7 +252,7 @@ msgid "Proceed with installation? [Y/n] " msgstr "" #: pkgbuilder/utils.py:107 -msgid " [installed: {0}]" +msgid " [installed: {}]" msgstr "" #: pkgbuilder/utils.py:109 @@ -275,7 +273,7 @@ msgstr "" #. TRANSLATORS: space it properly. `yes/no' below are #. for `out of date'. -#: pkgbuilder/utils.py:186 +#: pkgbuilder/utils.py:192 msgid "" "Repository : aur\n" "Category : {cat}\n" @@ -291,32 +289,32 @@ msgid "" "Description : {dsc}\n" msgstr "" -#: pkgbuilder/utils.py:204 +#: pkgbuilder/utils.py:210 msgid "yes" msgstr "" -#: pkgbuilder/utils.py:205 +#: pkgbuilder/utils.py:211 msgid "no" msgstr "" #. TRANSLATORS: Note the double space, which is present in #. pacman itself. Please consult your pacman localization #. for details. -#: pkgbuilder/wrapper.py:84 +#: pkgbuilder/wrapper.py:87 #, python-format msgid "%(prog)s [...]" msgstr "" #. TRANSLATORS: see pacman’s localizations -#: pkgbuilder/wrapper.py:217 +#: pkgbuilder/wrapper.py:220 msgid "usage: {} [...]" msgstr "" -#: pkgbuilder/wrapper.py:219 +#: pkgbuilder/wrapper.py:222 msgid "{}, a wrapper for pacman and PKGBUILDer." msgstr "" -#: pkgbuilder/wrapper.py:221 +#: pkgbuilder/wrapper.py:224 msgid "" "Pacman and PKGBUILDer syntaxes apply. Consult their manpages/help commands " "for details." @@ -337,7 +335,7 @@ msgid "" "Something went wrong. Please read makepkg's output and try again.\n" "You can also try to debug the work of this script yourself.\n" "All the files this script was working on are placed in\n" -" {0}\n" +" {}\n" "(the number is random).\n" "\n" "If I am wrong, though, congratulations!\n" @@ -369,7 +367,7 @@ msgid "" "Read the above output. If the script had any problems, run it\n" "again. You can also try to debug the work of this script yourself.\n" "All the files this script was working on are placed in\n" -" {0}\n" +" {}\n" "(the number is random).\n" "\n" "If everything went fine, though, congratulations! You can now use\n" @@ -391,7 +389,7 @@ msgstr "" msgid "" "It looks like you want to quit. Okay then, goodbye.\n" "All the files this script was working on are placed in\n" -" {0}\n" +" {}\n" "(the number is random).\n" "\n" "If that's what you want to do, go for it. If it isn't, run this\n" diff --git a/pbwrapperhelp b/pbwrapperhelp new file mode 100644 index 0000000..82870d6 --- /dev/null +++ b/pbwrapperhelp @@ -0,0 +1,63 @@ +usage: pacman {-S --sync} [options] [package(s)] +options: + -b, --dbpath set an alternate database location + -c, --clean remove old packages from cache directory (-cc for all) + -d, --nodeps skip dependency version checks (-dd to skip all checks) + -f, --force force install, overwrite conflicting files + -g, --groups view all members of a package group + -i, --info view package information + -l, --list view a list of packages in a repo + -p, --print print the targets instead of performing the operation + -q, --quiet show less information for query and search + -r, --root set an alternate installation root + -s, --search search remote repositories for matching strings + -u, --sysupgrade upgrade installed packages (-uu allows downgrade) + -v, --verbose be verbose + -w, --downloadonly download packages but do not install/upgrade anything + -y, --refresh download fresh package databases from the server + --arch set an alternate architecture + --asdeps install packages as non-explicitly installed + --asexplicit install packages as explicitly installed + --cachedir set an alternate package cache location + --config set an alternate configuration file + --dbonly only modify database entries, not package files + --debug display debug messages + --gpgdir set an alternate home directory for GnuPG + --ignore ignore a package upgrade (can be used more than once) + --ignoregroup + ignore a group upgrade (can be used more than once) + --logfile set an alternate log file + --needed do not reinstall up to date packages + --noconfirm do not ask for any confirmation + --noprogressbar do not show a progress bar when downloading files + --noscriptlet do not execute the install scriptlet if one exists + --print-format + specify how the targets should be printed +usage: pkgbuilder [-h] [-V] [-c] [--debug] [-d] [-v] [-w] [-P PROTOCOL] [-S] + [-y] [-i] [-s] [-u] + [PACKAGE [PACKAGE ...]] + +An AUR helper (and library) in Python 3. + +positional arguments: + PACKAGE packages to build + +optional arguments: + -h, --help show this help message and exit + -V, --version show version number and quit + +options: + -c, --nocolors don't use colors in output + --debug display debug messages + -d, --nodepcheck don't check dependencies (may break makepkg) + -v, --novalidation don't check if packages were installed after build + -w, --buildonly don't install packages after building + -P PROTOCOL, --protocol PROTOCOL + choose protocol (default: http) + -S, --sync pacman-like mode + -y, --refresh (dummy) + +operations: + -i, --info view package information + -s, --search search the AUR for matching strings + -u, --sysupgrade upgrade installed AUR packages diff --git a/pkgbuilder/__init__.py b/pkgbuilder/__init__.py index e38ecf7..9f2feba 100755 --- a/pkgbuilder/__init__.py +++ b/pkgbuilder/__init__.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 # -*- encoding: utf-8 -*- -# PKGBUILDer v2.1.4.0 +# PKGBUILDer v2.1.4.1 # An AUR helper (and library) in Python 3. # Copyright (C) 2011-2012, Kwpolska. # All rights reserved. @@ -44,7 +44,7 @@ """ __title__ = 'PKGBUILDer' -__version__ = '2.1.4.0' +__version__ = '2.1.4.1' __author__ = 'Kwpolska' __license__ = '3-clause BSD' __docformat__ = 'restructuredtext en' diff --git a/pkgbuilder/aur.py b/pkgbuilder/aur.py index 8a27cec..ab01049 100755 --- a/pkgbuilder/aur.py +++ b/pkgbuilder/aur.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 # -*- encoding: utf-8 -*- -# PKGBUILDer v2.1.4.0 +# PKGBUILDer v2.1.4.1 # An AUR helper (and library) in Python 3. # Copyright (C) 2011-2012, Kwpolska. # See /LICENSE for licensing information. @@ -25,8 +25,8 @@ class AUR: """A class for calling the AUR API.""" - rpc = '{0}://aur.archlinux.org/rpc.php?type={1}&arg={2}' - mrpc = '{0}://aur.archlinux.org/rpc.php?type=multiinfo{1}' + rpc = '{}://aur.archlinux.org/rpc.php?type={}&arg={}' + mrpc = '{}://aur.archlinux.org/rpc.php?type=multiinfo{}' def jsonreq(self, rtype, arg, prot='http'): """Makes a request and returns plain JSON data. @@ -39,7 +39,7 @@ def jsonreq(self, rtype, arg, prot='http'): :Message codes: ERR1001.""" req = requests.get(self.rpc.format(prot, rtype, arg)) if req.status_code != 200: - raise PBError(_('AUR: HTTP Error {0}').format( + raise PBError(_('AUR: HTTP Error {}').format( req.status_code)) return req.text @@ -56,7 +56,7 @@ def jsonmultiinfo(self, args, prot='http'): urlargs = '&arg[]=' + '&arg[]='.join(args) req = requests.get(self.mrpc.format(prot, urlargs)) if req.status_code != 200: - raise PBError(_('AUR: HTTP Error {0}').format( + raise PBError(_('AUR: HTTP Error {}').format( req.status_code)) return req.text diff --git a/pkgbuilder/build.py b/pkgbuilder/build.py index a26ef96..4edf85d 100755 --- a/pkgbuilder/build.py +++ b/pkgbuilder/build.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 # -*- encoding: utf-8 -*- -# PKGBUILDer v2.1.4.0 +# PKGBUILDer v2.1.4.1 # An AUR helper (and library) in Python 3. # Copyright (C) 2011-2012, Kwpolska. # See /LICENSE for licensing information. @@ -33,7 +33,7 @@ class Build: """Functions for building packages.""" utils = Utils() - aururl = '{0}://aur.archlinux.org{1}' + aururl = '{}://aur.archlinux.org{}' def auto_build(self, pkgname, validate=True, performdepcheck=True, makepkginstall=True): @@ -61,15 +61,14 @@ def auto_build(self, pkgname, validate=True, performdepcheck=True, pkg = localdb.get_pkg(pkgname) aurversion = self.utils.info(pkgname)['Version'] if pkg is None: - DS.fancy_error2(_('validation: NOT \ -installed')) + DS.fancy_error2(_('validation: NOT installed')) else: if pyalpm.vercmp(aurversion, pkg.version) > 0: - DS.fancy_error2(_('validation: \ -outdated {0}').format(pkg.version)) + DS.fancy_error2(_('validation: outdated ' + '{}').format(pkg.version)) else: - DS.fancy_msg2(_('validation: \ -installed {0}').format(pkg.version)) + DS.fancy_msg2(_('validation: installed ' + '{}').format(pkg.version)) elif build_result[0] >= 0 and build_result[0] < 72000: # PBxxx. raise PBError(_('makepkg (or someone else) failed and ' 'returned {}.').format(build_result[0])) @@ -78,7 +77,8 @@ def auto_build(self, pkgname, validate=True, performdepcheck=True, raise PBError(_('PKGBUILDer had a problem.')) exit(1) elif build_result[0] == 72737: # PBREQ. - raise PBError(_('PKGBUILDer (or the requests library) had' + # TRANSLATORS: do not translate the word 'requests'. + raise PBError(_('PKGBUILDer (or the requests library) had ' 'problems with fulfilling an HTTP request.')) exit(1) elif build_result[0] == 72101: # I/O error. @@ -108,7 +108,7 @@ def download(self, urlpath, filename, prot='http'): # Error handling. if r.status_code != 200: - raise PBError(_('download: HTTP Error {0}').format( + raise PBError(_('download: HTTP Error {}').format( r.status_code)) elif r.headers['content-length'] == '0': raise PBError(_('download: 0 bytes downloaded')) @@ -155,16 +155,16 @@ def prepare_deps(self, pkgbuild): # And it takes only 7 lines instead of about 40 in the pyparsing # implementation. - pb = subprocess.Popen('source '+pkgbuild+'; for i in ${depends[*]}; \ -do echo $i; done; for i in ${makedepends[*]}; do echo $i; done', shell=True, - stdout=subprocess.PIPE) + pb = subprocess.Popen('source ' + pkgbuild + '; for i in ${depends' + '[*]}; do echo $i; done; for i in ' + '${makedepends[*]}; do echo $i; done', + shell=True, stdout=subprocess.PIPE) deps = pb.stdout.read() deps = deps.decode('utf-8') deps = deps.split('\n') return deps - def depcheck(self, depends): """Performs a dependency check. @@ -190,12 +190,12 @@ def depcheck(self, depends): syncpkgs.append(j) syncpkgs = functools.reduce(lambda x, y: x + y, syncpkgs) for dep in depends: - if dep == '': # eg. pyload 0.4.9-4 + if dep == '': continue if re.search('[<=>]', dep): - vpat = '>=<|><=|=><|=<>|<>=|<=>|>=|=>|><|<>|=<|\ -<=|>|=|<' + vpat = ('>=<|><=|=><|=<>|<>=|<=>|>=|=>|><|<>|=<|' + '<=|>|=|<') ver_base = re.split(vpat, dep) dep = ver_base[0] @@ -207,7 +207,7 @@ def depcheck(self, depends): parseddeps[dep] = 2 else: parseddeps[dep] = -1 - raise PBError(_('depcheck: cannot find {0} ' + raise PBError(_('depcheck: cannot find {} ' 'anywhere').format(dep)) return parseddeps @@ -232,9 +232,9 @@ def build_runner(self, pkgname, performdepcheck=True, # exists pkg = self.utils.info(pkgname) if pkg is None: - raise PBError(_('Package {0} not found.').format(pkgname)) + raise PBError(_('Package {} not found.').format(pkgname)) pkgname = pkg['Name'] - DS.fancy_msg(_('Building {0}...').format(pkgname)) + DS.fancy_msg(_('Building {}...').format(pkgname)) self.utils.print_package_search(pkg, prefix=DS.colors['blue'] + ' ->' + DS.colors['all_off'] + @@ -246,10 +246,10 @@ def build_runner(self, pkgname, performdepcheck=True, DS.fancy_msg(_('Downloading the tarball...')) downloadbytes = self.download(pkg['URLPath'], filename) kbytes = int(downloadbytes) / 1000 - DS.fancy_msg2(_('{0} kB downloaded').format(kbytes)) + DS.fancy_msg2(_('{} kB downloaded').format(kbytes)) DS.fancy_msg(_('Extracting...')) - DS.fancy_msg2(_('{0} files extracted').format(self.extract( + DS.fancy_msg2(_('{} files extracted').format(self.extract( filename))) os.chdir('./{}/'.format(pkgname)) @@ -269,8 +269,8 @@ def build_runner(self, pkgname, performdepcheck=True, if pkgtype == 2: aurbuild.append(pkg) - DS.fancy_msg2('{0}: {1}'.format(pkg, - pkgtypes[pkgtype])) + DS.fancy_msg2('{}: {}'.format(pkg, + pkgtypes[pkgtype])) if aurbuild != []: return [16, aurbuild] diff --git a/pkgbuilder/main.py b/pkgbuilder/main.py index 0daf36c..efbc9c4 100755 --- a/pkgbuilder/main.py +++ b/pkgbuilder/main.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 # -*- encoding: utf-8 -*- -# PKGBUILDer v2.1.4.0 +# PKGBUILDer v2.1.4.1 # An AUR helper (and library) in Python 3. # Copyright (C) 2011-2012, Kwpolska. # See /LICENSE for licensing information. @@ -29,8 +29,8 @@ def main(source='AUTO'): """Main routine of PKGBUILDer.""" try: DS.log.info('Initialized, parsing arguments.') - parser = argparse.ArgumentParser(description=_('An AUR helper \ - (and library) in Python 3.')) + parser = argparse.ArgumentParser(description=_('An AUR helper' + ' (and library) in Python 3.')) parser.add_argument('-V', '--version', action='version', version='PKGBUILDer v' + __version__, @@ -42,39 +42,36 @@ def main(source='AUTO'): argopr = parser.add_argument_group(_('operations')) argopt.add_argument('-c', '--nocolors', action='store_false', - default=True, dest='color', help=_('don\'t use \ - colors in output')) + default=True, dest='color', help=_('don\'t use ' + 'colors in output')) argopt.add_argument('--debug', action='store_true', default=False, dest='debug', help=_('display debug messages')) argopt.add_argument('-d', '--nodepcheck', action='store_false', - default=True, dest='depcheck', help=_('don\'t \ - check dependencies (may break makepkg)')) + default=True, dest='depcheck', help=_('don\'t ' + 'check dependencies (may break makepkg)')) argopt.add_argument('-v', '--novalidation', action='store_false', - default=True, dest='valid', help=_('don\'t check \ - if packages were installed after build')) + default=True, dest='valid', help=_('don\'t check ' + 'if packages were installed after build')) argopt.add_argument('-w', '--buildonly', action='store_false', - default=True, dest='mkpginst', help=_('don\'t \ - install packages after building')) + default=True, dest='mkpginst', help=_('don\'t ' + 'install packages after building')) argopt.add_argument('-P', '--protocol', action='store', default='http', dest='protocol', - metavar=_('PROTOCOL'), help=_('choose \ - protocol (default: http)')) + metavar=_('PROTOCOL'), help=_('choose ' + 'protocol (default: http)')) argopt.add_argument('-S', '--sync', action='store_true', default=False, - dest='pac', help=_('pacman-like mode \ - (/tmp/ build, aur/ in -s)')) + dest='pac', help=_('pacman-like mode')) argopt.add_argument('-y', '--refresh', action='store_true', default=False, dest='pacupd', help=_('(dummy)')) - argopr.add_argument('-i', '--info', action='store_true', default=False, dest='info', help=_('view package information')) argopr.add_argument('-s', '--search', action='store_true', - default=False, dest='search', help=_('search the \ - AUR for matching strings')) + default=False, dest='search', help=_('search the ' + 'AUR for matching strings')) argopr.add_argument('-u', '--sysupgrade', action='store_true', default=False, dest='upgrade', help=_('upgrade installed AUR packages')) - if source != 'AUTO': args = parser.parse_args(source) else: @@ -113,7 +110,7 @@ def main(source='AUTO'): if len(searchstring) < 3: # this would be too many entries, but this is an actual API # limitation and not an idea of yours truly. - DS.fancy_error(_('search string too short, API limitation')) + DS.fancy_error(_('Search query too short, API limitation')) DS.fancy_msg(_('Searching for exact match...')) search = [utils.info(searchstring)] if search == [None]: @@ -145,7 +142,7 @@ def main(source='AUTO'): if args.pac: DS.log.debug('-S passed, building in /tmp/.') uid = os.geteuid() - path = '/tmp/pkgbuilder-{0}'.format(str(uid)) + path = '/tmp/pkgbuilder-{}'.format(str(uid)) if not os.path.exists(path): os.mkdir(path) os.chdir(path) @@ -163,7 +160,7 @@ def main(source='AUTO'): # If we didn't exit, we shall build the packages. DS.log.info('Starting build...') for pkgname in args.pkgs: - DS.log.info('Building {0}'.format(pkgname)) + DS.log.info('Building {}'.format(pkgname)) build.auto_build(pkgname, DS.validate, DS.depcheck, DS.mkpginst) DS.log.info('Quitting.') diff --git a/pkgbuilder/pbds.py b/pkgbuilder/pbds.py index 363d178..fc399df 100755 --- a/pkgbuilder/pbds.py +++ b/pkgbuilder/pbds.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 # -*- encoding: utf-8 -*- -# PKGBUILDer v2.1.4.0 +# PKGBUILDer v2.1.4.1 # An AUR helper (and library) in Python 3. # Copyright (C) 2011-2012, Kwpolska. # See /LICENSE for licensing information. @@ -77,6 +77,7 @@ class PBDS(): level=logging.DEBUG) log = logging.getLogger('pkgbuilder') log.info('*** PKGBUILDer v' + __version__) + def debugout(self, nochange=False): """Print all the logged messages to stderr. @@ -90,7 +91,7 @@ def debugout(self, nochange=False): self.console = logging.StreamHandler() self.console.setLevel(logging.DEBUG) self.console.setFormatter(logging.Formatter('[%(levelname)-7s] ' - ':%(name)-10s: %(message)s')) + ':%(name)-10s: %(message)s')) logging.getLogger('').addHandler(self.console) self.debug = True elif self.debug and nochange: diff --git a/pkgbuilder/upgrade.py b/pkgbuilder/upgrade.py index 858b46a..e01cf6d 100755 --- a/pkgbuilder/upgrade.py +++ b/pkgbuilder/upgrade.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 # -*- encoding: utf-8 -*- -# PKGBUILDer v2.1.4.0 +# PKGBUILDer v2.1.4.1 # An AUR helper (and library) in Python 3. # Copyright (C) 2011-2012, Kwpolska. # See /LICENSE for licensing information. @@ -100,9 +100,9 @@ def auto_upgrade(self): upglen = len(upgradeable) if upglen > 0: if DS.pacman: - print(_('Targets ({0}): ').format(upglen), end='') + print(_('Targets ({}): ').format(upglen), end='') else: - DS.fancy_msg(_('{0} upgradeable packages found:').format( + DS.fancy_msg(_('{} upgradeable packages found:').format( upglen)) if upglen == 0: @@ -118,14 +118,14 @@ def auto_upgrade(self): else: DS.fancy_msg2(' '.join(upgradeable)) query = (DS.colors['green'] + '==>' + DS.colors['all_off'] + - DS.colors['bold'] + ' ' + _('Proceed with \ -installation? [Y/n] ') + DS.colors['all_off']) + DS.colors['bold'] + ' ' + _('Proceed with ' + 'installation? [Y/n] ') + DS.colors['all_off']) yesno = input(query) yesno = yesno + ' ' # cheating... if yesno[0] == 'n' or yesno[0] == 'N': return 0 for pkgname in upgradeable: - DS.log.info('Building {0}'.format(pkgname)) + DS.log.info('Building {}'.format(pkgname)) self.build.auto_build(pkgname, DS.validate, DS.depcheck, DS.mkpginst) diff --git a/pkgbuilder/utils.py b/pkgbuilder/utils.py index 60cae50..c10d957 100755 --- a/pkgbuilder/utils.py +++ b/pkgbuilder/utils.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 # -*- encoding: utf-8 -*- -# PKGBUILDer v2.1.4.0 +# PKGBUILDer v2.1.4.1 # An AUR helper (and library) in Python 3. # Copyright (C) 2011-2012, Kwpolska. # See /LICENSE for licensing information. @@ -104,7 +104,7 @@ def print_package_search(self, pkg, use_categories=True, prefixp2 = prefixp + ' ' if lpkg is not None: if pyalpm.vercmp(pkg['Version'], lpkg.version) != 0: - installed = _(' [installed: {0}]').format(lpkg.version) + installed = _(' [installed: {}]').format(lpkg.version) else: installed = _(' [installed]') if pkg['OutOfDate'] == '1': @@ -171,15 +171,21 @@ def tzname(self, dt): def dst(self, dt): return datetime.timedelta(0) - upd = datetime.datetime.fromtimestamp(float(pkg['Last\ -Modified']), tz=UTC()).strftime('%Y-%m-%dT%H:%M:%S%Z') - fsb = datetime.datetime.fromtimestamp(float(pkg['First\ -Submitted']), tz=UTC()).strftime('%Y-%m-%dT%H:%M:%S%Z') + fmt = '%Y-%m-%dT%H:%M:%S%Z' + + upd = datetime.datetime.fromtimestamp(float(pkg['Last' + 'Modified']), + tz=UTC()).strftime(fmt) + fsb = datetime.datetime.fromtimestamp(float(pkg['First' + 'Submitted']), + tz=UTC()).strftime(fmt) else: - upd = datetime.datetime.fromtimestamp(float(pkg['Last\ -Modified'])).strftime('%Y-%m-%dT%H:%M:%S%Z') - fsb = datetime.datetime.fromtimestamp(float(pkg['First\ -Submitted'])).strftime('%Y-%m-%dT%H:%M:%S%Z') + upd = datetime.datetime.fromtimestamp(float(pkg['Last' + 'Modified']) + ).strftime(fmt) + fsb = datetime.datetime.fromtimestamp(float(pkg['First' + 'Submitted']) + ).strftime(fmt) # TRANSLATORS: space it properly. `yes/no' below are # for `out of date'. diff --git a/pkgbuilder/wrapper.py b/pkgbuilder/wrapper.py index c077e8a..986003f 100755 --- a/pkgbuilder/wrapper.py +++ b/pkgbuilder/wrapper.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 # -*- encoding: utf-8 -*- # PBWrapper v0.1.0 -# PKGBUILDer v2.1.4.0 +# PKGBUILDer v2.1.4.1 # An AUR helper (and library) in Python 3. # Copyright (C) 2011-2012, Kwpolska. # See /LICENSE for licensing information. @@ -32,6 +32,8 @@ __wrapperversion__ = '0.1.0' ### wrapper() A wrapper for pacman/PB ### + + def wrapper(source='AUTO'): """A wrapper for pacman and PKGBUILDer.""" pyc = pycman.config.init_with_config('/etc/pacman.conf') @@ -48,11 +50,11 @@ def wrapper(source='AUTO'): DS.debugout() log.info('*** PBwrapper v{} (PKGBUILDer ' - '{})'.format(__wrapperversion__, __version__)) + '{})'.format(__wrapperversion__, __version__)) if (('-S' in argst) or ('--sync' in argst) or (re.search('-[a-zA-Z]*S', - ' '.join(argst)) - is not None)): + ' '.join(argst)) + is not None)): # The user has requested -S. log.debug('Got -S, preparing to parse arguments...') pacmanshort = ['f', 'g', 'p', 'q'] @@ -68,7 +70,8 @@ def wrapper(source='AUTO'): pbshorta = ['P'] pblonga = ['protocol'] commonshort = ['S', 'c', 'd', 'i', 's', 'u', 'v', 'w', 'y'] - commonlong = ['debug', 'info', 'refresh', 'search' ,'sync', 'sysupgrade'] + commonlong = ['debug', 'info', 'refresh', 'search', + 'sync', 'sysupgrade'] allpacman = pacmanshort + pacmanlong + pacmanshorta + pacmanlonga allpb = pblong + pbshorta + pblonga @@ -131,7 +134,7 @@ def wrapper(source='AUTO'): for i in args.__dict__.items(): if i[1] is not False: # == This argument has been provided. - if i[1] == True: + if i[1]: # == This argument doesn't have a value. if i[0] in allshort: execargs.append('-' + i[0]) @@ -218,10 +221,9 @@ def wrapper(source='AUTO'): os.path.basename(sys.argv[0]))) print('\n' + _('{}, a wrapper for pacman and ' 'PKGBUILDer.').format('pb')) - print(_('Pacman and PKGBUILDer syntaxes apply. Consult their ' \ + print(_('Pacman and PKGBUILDer syntaxes apply. Consult their ' 'manpages/help commands for details.')) - elif ('-V' in argst) or ('--version' in argst): pacpkg = localdb.get_pkg('pacman') print("""PBWrapper v{} diff --git a/release b/release index 2e84d70..aac37f7 100755 --- a/release +++ b/release @@ -72,9 +72,11 @@ 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') - echo "Hit Enter to validate language $language." + echo "Hit Enter to validate language $language or c to cancel and ignore." read validatesure - $EDITOR $popath + if [[ $validatesure != 'c' ]]; then + $EDITOR $popath + fi msgfmt -o $podir/pkgbuilder.mo $popath done @@ -88,11 +90,13 @@ if [[ $? = 1 ]]; then cat /tmp/pbwrapperdiff echo 'Hit Enter to quit or c to copy the file over and continue.' read pbwrapperhelp - if [[ pbwrapperhelp = 'c' ]]; then + if [[ $pbwrapperhelp = 'c' ]]; then cp /tmp/pbwrapperhelp .pbwrapperhelp rm /tmp/pbwrapperhelp /tmp/pbwrapperdiff echo 'Continuing with release scripts.' else + rm /tmp/pbwrapperhelp /tmp/pbwrapperdiff + exit 1 fi fi @@ -108,6 +112,9 @@ if [[ $? = 1 ]]; then exit 1 fi +echo 'This is the last chance to quit. Hit ^C now if you want to.' +read bailout + ./setup.py sdist upload md5out=$(md5sum 'dist/'$project'-'$version'.tar.gz'|awk '{print $1}') diff --git a/setup.py b/setup.py index 08b1f42..6e1aba8 100755 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ from distutils.core import setup setup(name='pkgbuilder', - version='2.1.4.0', + version='2.1.4.1', description='An AUR helper (and library) in Python 3.', author='Kwpolska', author_email='kwpolska@kwpolska.tk',