diff --git a/PKGBUILD b/PKGBUILD index e05b6f7..f4a1785 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Kwpolska pkgname=pkgbuilder -pkgver=2.1.2.15 +pkgver=2.1.2.16 pkgrel=1 pkgdesc="A basic Python AUR helper/library." arch=('any') @@ -9,7 +9,7 @@ license=('BSD') depends=('python' 'pyalpm>=0.5.1-1' 'python-pyparsing' 'pacman>=4.0.0-1') options=(!emptydirs) source=("http://pypi.python.org/packages/source/p/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('7b10ec580f1ddf5c274df6eac5e47f04') +md5sums=('a8888df6ac7d1b622b3a7feee00005eb') package() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/README.rst b/README.rst index dc05e38..2133474 100644 --- a/README.rst +++ b/README.rst @@ -3,8 +3,8 @@ README for PKGBUILDer ===================== :Info: This is the README file for PKGBUILDer. :Author: Kwpolska -:Date: 2011-11-26 -:Version: 2.1.2.15 +:Date: 2011-11-30 +:Version: 2.1.2.16 PKGBUILDer. A Python AUR helper/library. ========================================= diff --git a/dist/pkgbuilder-2.1.2.16.tar.gz b/dist/pkgbuilder-2.1.2.16.tar.gz new file mode 100644 index 0000000..68dc019 Binary files /dev/null and b/dist/pkgbuilder-2.1.2.16.tar.gz differ diff --git a/docs/LICENSE.rst b/docs/LICENSE.rst index 9d1c396..114cc55 100644 --- a/docs/LICENSE.rst +++ b/docs/LICENSE.rst @@ -3,8 +3,8 @@ Appendix B. License for PKGBUILDer ================================== :Info: This is an appendix to the PKGBUILDer documentation. :Author: Kwpolska -:Date: 2011-11-26 -:Version: 2.1.2.15 +:Date: 2011-11-30 +:Version: 2.1.2.16 Copyright (C) 2011, Kwpolska All rights reserved. diff --git a/docs/README.rst b/docs/README.rst index dc05e38..2133474 100644 --- a/docs/README.rst +++ b/docs/README.rst @@ -3,8 +3,8 @@ README for PKGBUILDer ===================== :Info: This is the README file for PKGBUILDer. :Author: Kwpolska -:Date: 2011-11-26 -:Version: 2.1.2.15 +:Date: 2011-11-30 +:Version: 2.1.2.16 PKGBUILDer. A Python AUR helper/library. ========================================= diff --git a/docs/classes.rst b/docs/classes.rst index eb0b3d3..c192d3a 100644 --- a/docs/classes.rst +++ b/docs/classes.rst @@ -4,8 +4,8 @@ Classes in PKGBUILDer :Author: Kwpolska :Copyright: See Appendix B. -:Date: 2011-11-26 -:Version: 2.1.2.15 +:Date: 2011-11-30 +:Version: 2.1.2.16 .. index:: classes .. module:: PKGBUILDer diff --git a/docs/conf.py b/docs/conf.py index 22ffa86..e0b9e06 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.15' +release = '2.1.2.16' # 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 ffd7a80..7dc71a0 100644 --- a/docs/messagecodes.rst +++ b/docs/messagecodes.rst @@ -3,8 +3,8 @@ Appendix A. PKGBUILDer message numbers list =========================================== :Info: This is an appendix to the PKGBUILDer documentation. :Author: Kwpolska -:Date: 2011-11-26 -:Version: 2.1.2.15 +:Date: 2011-11-30 +:Version: 2.1.2.16 In order to help debugging, messages are numbered. Each message number has four digits: the first one is the diff --git a/docs/pkgbuilder.8.gz b/docs/pkgbuilder.8.gz index e86d801..4bd05bb 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 82e172b..3919bbd 100644 --- a/docs/pkgbuilder.rst +++ b/docs/pkgbuilder.rst @@ -4,8 +4,8 @@ PKGBUILDer :Author: Kwpolska :Copyright: See Appendix B. -:Date: 2011-11-26 -:Version: 2.1.2.15 +:Date: 2011-11-30 +:Version: 2.1.2.16 :Manual section: 8 :Manual group: PKGBUILDer manual diff --git a/pkgbuilder.py b/pkgbuilder.py index 8e6f3c7..c6eb336 100755 --- a/pkgbuilder.py +++ b/pkgbuilder.py @@ -1,5 +1,5 @@ #!/usr/bin/python3 -# PKGBUILDer v2.1.2.15 +# PKGBUILDer v2.1.2.16 # A Python AUR helper/library. # Copyright (C) 2011, Kwpolska # All rights reserved. @@ -52,7 +52,7 @@ import functools import logging -VERSION = '2.1.2.15' +VERSION = '2.1.2.16' ### PBDS PB global data storage ### class PBDS: @@ -193,7 +193,7 @@ def __init__(self, msg): :Arguments: a message.""" self.msg = msg - L.error('PBError: '+self) + L.error('PBError: '+self.msg) def __str__(self): """You want to see error messages, don't you? @@ -279,10 +279,7 @@ def msearch(self, username): :Arguments: username. :Returns: a list.""" aur_pkgs = self.aur.request('msearch', username) - if aur_pkgs['results'] == 'No results found': - return [] - else: - return aur_pkgs['results'] + return aur_pkgs['results'] def search(self, pkgname): """Searches for AUR packages. @@ -290,10 +287,7 @@ def search(self, pkgname): :Arguments: package name. :Returns: a list.""" aur_pkgs = self.aur.request('search', pkgname) - if aur_pkgs['results'] == 'No results found': - return [] - else: - return aur_pkgs['results'] + return aur_pkgs['results'] def print_package(self, pkg, use_categories = True, prefix=''): """Outputs info about package. diff --git a/scripts/pkgbuilder b/scripts/pkgbuilder index bb5b2ae..39a7a20 100755 --- a/scripts/pkgbuilder +++ b/scripts/pkgbuilder @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # This file is a part of PKGBUILDer. -# File version: 2.1.2.15 +# File version: 2.1.2.16 # # Copyright (C) 2011, Kwpolska # All rights reserved. diff --git a/setup.py b/setup.py index 05b7eee..42a9216 100755 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from distutils.core import setup setup(name='pkgbuilder', - version='2.1.2.15', + version='2.1.2.16', description='An AUR helper (and library) in python3', author='Kwpolska', author_email='kwpolska@kwpolska.tk',