v2.1.3.2: minor fixes

Signed-off-by: Kwpolska <[email protected]>

PKGBUILD

@@ -1,6 +1,6 @@
 # Maintainer: Kwpolska <[email protected]>
 pkgname=pkgbuilder
-pkgver=2.1.3.1
+pkgver=2.1.3.2
 pkgrel=1
 pkgdesc='A Python AUR helper/library.'
 arch=('any')
@@ -9,7 +9,7 @@ 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=('f438fa19e0a82e2cfd7c204769c6acd6')
+md5sums=('53cb7199aa34496a3a538297b5c9c5a8')
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"

README.rst

@@ -3,8 +3,8 @@ README for PKGBUILDer
 =====================
 :Info: This is the README file for PKGBUILDer.
 :Author: Kwpolska <[email protected]>
-:Date: 2012-08-06
-:Version: 2.1.3.1
+:Date: 2012-08-08
+:Version: 2.1.3.2
 
 PKGBUILDer.  A Python AUR helper/library.
 =========================================

docs/CHANGELOG.rst

@@ -3,8 +3,8 @@ Appendix C. Changelog
 =====================
 :Info: This is a partial changelog for PKGBUILDer.
 :Author: Kwpolska <[email protected]>
-:Date: 2012-08-06
-:Version: 2.1.3.1
+:Date: 2012-08-08
+:Version: 2.1.3.2
 
 .. index:: CHANGELOG
 

docs/LICENSE.rst

@@ -3,8 +3,8 @@ Appendix B. License for PKGBUILDer
 ==================================
 :Info: This is an appendix to the PKGBUILDer documentation.
 :Author: Kwpolska <[email protected]>
-:Date: 2012-08-06
-:Version: 2.1.3.1
+:Date: 2012-08-08
+:Version: 2.1.3.2
 
 .. index:: LICENSE
 

docs/README.rst

@@ -3,8 +3,8 @@ README for PKGBUILDer
 =====================
 :Info: This is the README file for PKGBUILDer.
 :Author: Kwpolska <[email protected]>
-:Date: 2012-08-06
-:Version: 2.1.3.1
+:Date: 2012-08-08
+:Version: 2.1.3.2
 
 .. index: README
 

docs/aur.rst

@@ -3,8 +3,8 @@ aur module (AUR class)
 ======================
 :Author: Kwpolska
 :Copyright: See Appendix B.
-:Date: 2012-08-06
-:Version: 2.1.3.1
+:Date: 2012-08-08
+:Version: 2.1.3.2
 
 .. module:: aur
 

docs/build.rst

@@ -3,8 +3,8 @@ build module (Build class)
 ==========================
 :Author: Kwpolska
 :Copyright: See Appendix B.
-:Date: 2012-08-06
-:Version: 2.1.3.1
+:Date: 2012-08-08
+:Version: 2.1.3.2
 
 .. module:: build
 

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.3.1'
+release = '2.1.3.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/main.rst

@@ -3,8 +3,8 @@ main module
 ===========
 :Author: Kwpolska
 :Copyright: See Appendix B.
-:Date: 2012-08-06
-:Version: 2.1.3.1
+:Date: 2012-08-08
+:Version: 2.1.3.2
 
 .. index:: main
 .. versionadded:: 2.1.3.0

docs/messagecodes.rst

@@ -3,8 +3,8 @@ Appendix A. PKGBUILDer message codess list
 ==========================================
 :Info: This is an appendix to the PKGBUILDer documentation.
 :Author: Kwpolska <[email protected]>
-:Date: 2012-08-06
-:Version: 2.1.3.1
+:Date: 2012-08-08
+:Version: 2.1.3.2
 
 .. index:: Message Codes
 

docs/pbds.rst

@@ -4,8 +4,8 @@ pbds module (PBDS class)
 
 :Author: Kwpolska
 :Copyright: See Appendix B.
-:Date: 2012-08-06
-:Version: 2.1.3.1
+:Date: 2012-08-08
+:Version: 2.1.3.2
 
 .. module: pbds
 

docs/pkgbuilder.rst

@@ -4,8 +4,8 @@ PKGBUILDer
 
 :Author: Kwpolska <[email protected]>
 :Copyright: See Appendix B.
-:Date: 2012-08-06
-:Version: 2.1.3.1
+:Date: 2012-08-08
+:Version: 2.1.3.2
 :Manual section: 8
 :Manual group: PKGBUILDer manual
 

docs/upgrade.rst

@@ -4,8 +4,8 @@ upgrade module (Upgrade class)
 
 :Author: Kwpolska
 :Copyright: See Appendix B.
-:Date: 2012-08-06
-:Version: 2.1.3.1
+:Date: 2012-08-08
+:Version: 2.1.3.2
 
 .. module:: upgrade
 

docs/utils.rst

@@ -4,8 +4,8 @@ utils module (Utils class)
 
 :Author: Kwpolska
 :Copyright: See Appendix B.
-:Date: 2012-08-06
-:Version: 2.1.3.1
+:Date: 2012-08-08
+:Version: 2.1.3.2
 
 .. module:: utils
 

locale/en/LC_MESSAGES/pkgbuilder.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: $version\n"
 "Report-Msgid-Bugs-To: Kwpolska <[email protected]>\n"
-"POT-Creation-Date: 2012-08-06 18:09+0200\n"
+"POT-Creation-Date: 2012-08-08 14:32+0200\n"
 "PO-Revision-Date: 2012-07-27 13:44+0100\n"
 "Last-Translator: Kwpolska <[email protected]>\n"
 "Language-Team: Kwpolska <[email protected]>\n"

locale/pl/LC_MESSAGES/pkgbuilder.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: $version\n"
 "Report-Msgid-Bugs-To: Kwpolska <[email protected]>\n"
-"POT-Creation-Date: 2012-08-06 18:09+0200\n"
+"POT-Creation-Date: 2012-08-08 14:32+0200\n"
 "PO-Revision-Date: 2012-07-27 14:20+0100\n"
 "Last-Translator: Kwpolska <[email protected]>\n"
 "Language-Team: Kwpolska <[email protected]>\n"

messages.pot

@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.1.3.1\n"
+"Project-Id-Version: 2.1.3.2\n"
 "Report-Msgid-Bugs-To: Kwpolska <[email protected]>\n"
-"POT-Creation-Date: 2012-08-06 18:09+0200\n"
-"PO-Revision-Date: 2012-08-06 18:09+0200\n"
+"POT-Creation-Date: 2012-08-08 14:32+0200\n"
+"PO-Revision-Date: 2012-08-08 14:32+0200\n"
 "Last-Translator: Kwpolska <[email protected]>\n"
 "Language-Team: Kwpolska <[email protected]>\n"
 "Language: en\n"

pkgbuilder/__init__.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 # -*- encoding: utf-8 -*-
-# PKGBUILDer v2.1.3.1
+# PKGBUILDer v2.1.3.2
 # An AUR helper/library.
 # Copyright (C) 2011-2012, Kwpolska.
 # All rights reserved.
@@ -44,7 +44,7 @@
 """
 
 __title__ = 'PKGBUILDer'
-__version__ = '2.1.3.1'
+__version__ = '2.1.3.2'
 __docformat__ = 'restructuredtext en'
 __author__ = 'Kwpolska'
 __license__ = 'BSD'

pkgbuilder/aur.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 # -*- encoding: utf-8 -*-
-# PKGBUILDer v2.1.3.1
+# PKGBUILDer v2.1.3.2
 # An AUR helper/library.
 # Copyright (C) 2011-2012, Kwpolska.
 # See /LICENSE for licensing information.
@@ -16,7 +16,7 @@
     :License: BSD (see /LICENSE).
 """
 
-from . import DS, T, _, PBError
+from . import _, PBError
 import requests
 import json
 
@@ -46,12 +46,12 @@ def jsonreq(self, rtype, arg, prot='http'):
 :Returns: JSON data from the API.
 :Exceptions: requests.exceptions.*, PBError.
 :Message codes: ERR1001."""
-        r = requests.get(self.rpc.format(prot, rtype, arg))
-        if r.status_code != 200:
+        req = requests.get(self.rpc.format(prot, rtype, arg))
+        if req.status_code != 200:
             raise PBError(_('[ERR1001] AUR: HTTP Error {0}').format(
-                r.status_code))
+                req.status_code))
 
-        return r.text
+        return req.text
 
     def jsonmultiinfo(self, args, prot='http'):
         """Makes a multiinfo request and returns plain JSON data.
@@ -63,12 +63,12 @@ def jsonmultiinfo(self, args, prot='http'):
 :Exceptions: requests.exceptions.*, PBError.
 :Message codes: ERR1001."""
         urlargs = '&arg[]=' + '&arg[]='.join(args)
-        r = requests.get(self.mrpc.format(prot, urlargs))
-        if r.status_code != 200:
+        req = requests.get(self.mrpc.format(prot, urlargs))
+        if req.status_code != 200:
             raise PBError(_('[ERR1001] AUR: HTTP Error {0}').format(
-                r.status_code))
+                req.status_code))
 
-        return r.text
+        return req.text
 
     def request(self, rtype, arg, prot='http'):
         """Makes a request.

pkgbuilder/build.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 # -*- encoding: utf-8 -*-
-# PKGBUILDer v2.1.3.1
+# PKGBUILDer v2.1.3.2
 # An AUR helper/library.
 # Copyright (C) 2011-2012, Kwpolska.
 # See /LICENSE for licensing information.
@@ -16,7 +16,7 @@
     :License: BSD (see /LICENSE).
 """
 
-from . import DS, T, _, PBError
+from . import DS, _, PBError
 from .utils import Utils
 from pyparsing import OneOrMore, Word
 import os
@@ -68,8 +68,8 @@ def auto_build(self, pkgname, validate=True, performdepcheck=True,
                 os.chdir('../')
                 if validate:
                     # check if installed
-                    H = pycman.config.init_with_config('/etc/pacman.conf')
-                    localdb = H.get_localdb()
+                    pyc = pycman.config.init_with_config('/etc/pacman.conf')
+                    localdb = pyc.get_localdb()
                     pkg = localdb.get_pkg(pkgname)
                     aurversion = self.utils.info(pkgname)['Version']
                     if pkg is None:
@@ -192,10 +192,10 @@ def depcheck(self, depends):
             return {}
         else:
             parseddeps = {}
-            H = pycman.config.init_with_config('/etc/pacman.conf')
-            localpkgs = H.get_localdb().pkgcache
+            pyc = pycman.config.init_with_config('/etc/pacman.conf')
+            localpkgs = pyc.get_localdb().pkgcache
             syncpkgs = []
-            for j in [i.pkgcache for i in H.get_syncdbs()]:
+            for j in [i.pkgcache for i in pyc.get_syncdbs()]:
                 syncpkgs.append(j)
             syncpkgs = functools.reduce(lambda x, y: x + y, syncpkgs)
             for dep in depends:

pkgbuilder/main.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 # -*- encoding: utf-8 -*-
-# PKGBUILDer v2.1.3.1
+# PKGBUILDer v2.1.3.2
 # An AUR helper/library.
 # Copyright (C) 2011-2012, Kwpolska.
 # See /LICENSE for licensing information.
@@ -120,7 +120,8 @@ def main():
                 else:
                     output = output + utils.print_package_search(pkg, True,
                                                                  True) + '\n'
-            print(output.rstrip())
+            if output != '':
+                print(output.rstrip())
             exit(0)
 
         if args.pac:

pkgbuilder/pbds.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 # -*- encoding: utf-8 -*-
-# PKGBUILDer v2.1.3.1
+# PKGBUILDer v2.1.3.2
 # An AUR helper/library.
 # Copyright (C) 2011-2012, Kwpolska.
 # See /LICENSE for licensing information.
@@ -16,7 +16,7 @@
     :License: BSD (see /LICENSE).
 """
 
-from . import T, _, PBError, __version__
+from . import _, PBError, __version__
 import sys
 import os
 import gettext

pkgbuilder/upgrade.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 # -*- encoding: utf-8 -*-
-# PKGBUILDer v2.1.3.1
+# PKGBUILDer v2.1.3.2
 # An AUR helper/library.
 # Copyright (C) 2011-2012, Kwpolska.
 # See /LICENSE for licensing information.

pkgbuilder/utils.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 # -*- encoding: utf-8 -*-
-# PKGBUILDer v2.1.3.1
+# PKGBUILDer v2.1.3.2
 # An AUR helper/library.
 # Copyright (C) 2011-2012, Kwpolska.
 # See /LICENSE for licensing information.
@@ -16,7 +16,7 @@
     :License: BSD (see /LICENSE).
 """
 
-from . import DS, T, _, PBError
+from . import DS, _, PBError
 from .aur import AUR
 import pyalpm
 import pycman

setup.py

@@ -7,7 +7,7 @@
 #from distutils.core import setup
 
 setup(name='pkgbuilder',
-      version='2.1.3.1',
+      version='2.1.3.2',
       description='An AUR helper (and library) in Python 3.',
       author='Kwpolska',
       author_email='[email protected]',