Skip to content

Commit

Permalink
2.1.1.1: bugfix release
Browse files Browse the repository at this point in the history
Signed-off-by: Kwpolska <[email protected]>
  • Loading branch information
Kwpolska committed Sep 23, 2011
1 parent 79e4827 commit 48553c3
Show file tree
Hide file tree
Showing 21 changed files with 32 additions and 180 deletions.
1 change: 0 additions & 1 deletion MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ docs/_build/doctrees/pkgbuilder.doctree
docs/html/.buildinfo
docs/html/README.html
docs/html/errorcodes.html
docs/html/genindex.html
docs/html/index.html
docs/html/objects.inv
docs/html/pkgbuilder.html
Expand Down
4 changes: 2 additions & 2 deletions PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Maintainer: Kwpolska <[email protected]>
pkgname=pkgbuilder
pkgver=2.1.1
pkgver=2.1.1.1
pkgrel=1
pkgdesc="A basic Python AUR helper/library."
arch=('any')
Expand All @@ -9,7 +9,7 @@ license=('BSD')
depends=('python' 'pyalpm' 'python-pyparsing')
options=(!emptydirs)
source=("http://pypi.python.org/packages/source/p/${pkgname}/${pkgname}-${pkgver}.tar.gz")
md5sums=('ccc0ffdd929b05ed7cc689d16ec06b04')
md5sums=('3eebaf12ba5fba95e2d31397dffd2b0f')

package() {
cd "${srcdir}/${pkgname}-${pkgver}"
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ README for PKGBUILDer
=====================
:Info: This is the README file for PKGBUILDer.
:Author: Kwpolska <[email protected]>
:Date: 2011-09-22
:Version: 2.1.0.2
:Date: 2011-09-23
:Version: 2.1.1.1

PKGBUILDer. A Python AUR helper/library.
=========================================
Expand Down
Binary file added dist/pkgbuilder-2.1.1.1.tar.gz
Binary file not shown.
6 changes: 5 additions & 1 deletion docs/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Makefile for Sphinx documentation
#
# modded by Kw

# You can set these variables from the command line.
SPHINXOPTS =
Expand Down Expand Up @@ -41,6 +41,10 @@ html:
@echo
@echo "Build finished. The HTML pages are in ./html."

zip:
cd html/
zip -r /tmp/docs.zip ./*

dirhtml:
$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
@echo
Expand Down
61 changes: 0 additions & 61 deletions docs/README.rst

This file was deleted.

1 change: 1 addition & 0 deletions docs/README.rst
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
# The short X.Y version.
version = '2.1'
# The full version, including alpha/beta/rc tags.
release = '2.1.1'
release = '2.1.1.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
4 changes: 2 additions & 2 deletions docs/errorcodes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Appendix B. PKGBUILDer error messages list
==========================================
:Info: This is an appendix to the PKGBUILDer documentation.
:Author: Kwpolska <[email protected]>
:Date: 2011-09-22
:Version: 2.1.1
:Date: 2011-09-23
:Version: 2.1.1.1

In order to help debugging, error messages are numbered.
Each error message number has four digits: the first one is the
Expand Down
2 changes: 1 addition & 1 deletion docs/html/README.html
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ <h3>Navigation</h3>
</div>
<div class="footer">
&copy; Copyright 2011, Kwpolska.
Last updated on 2011-09-22T15:09:29Z.
Last updated on 2011-09-23T20:09:54Z.
Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.0.7.
</div>
</body>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/_sources/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ README for PKGBUILDer
:Info: This is the README file for PKGBUILDer.
:Author: Kwpolska <[email protected]>
:Date: 2011-09-22
:Version: 2.1.1
:Version: 2.1.0.2

PKGBUILDer. A Python AUR helper/library.
=========================================
Expand Down
2 changes: 1 addition & 1 deletion docs/html/errorcodes.html
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ <h3>Navigation</h3>
</div>
<div class="footer">
&copy; Copyright 2011, Kwpolska.
Last updated on 2011-09-22T15:09:29Z.
Last updated on 2011-09-23T20:09:54Z.
Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.0.7.
</div>
</body>
Expand Down
91 changes: 0 additions & 91 deletions docs/html/genindex.html

This file was deleted.

2 changes: 1 addition & 1 deletion docs/html/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ <h3>Navigation</h3>
</div>
<div class="footer">
&copy; Copyright 2011, Kwpolska.
Last updated on 2011-09-22T16:09:02Z.
Last updated on 2011-09-23T20:09:54Z.
Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.0.7.
</div>
</body>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/pkgbuilder.html
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ <h3>Navigation</h3>
</div>
<div class="footer">
&copy; Copyright 2011, Kwpolska.
Last updated on 2011-09-22T16:09:02Z.
Last updated on 2011-09-23T20:09:54Z.
Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.0.7.
</div>
</body>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/search.html
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ <h3>Navigation</h3>
</div>
<div class="footer">
&copy; Copyright 2011, Kwpolska.
Last updated on 2011-09-22T16:09:02Z.
Last updated on 2011-09-23T20:09:54Z.
Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.0.7.
</div>
</body>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/searchindex.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
PKGBUILDer 2.1.1 documentation
PKGBUILDer 2.1.1.1 documentation
================================

Contents:
Expand Down
4 changes: 2 additions & 2 deletions docs/pkgbuilder.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ a Python AUR helper/library

:Author: Kwpolska <[email protected]>
:Copyright: This document has been placed in the public domain.
:Date: 2011-09-22
:Version: 2.1.1
:Date: 2011-09-23
:Version: 2.1.1.1
:Manual section: 8
:Manual group: PKGBUILDer manual

Expand Down
12 changes: 6 additions & 6 deletions pkgbuilder.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/python3
# PKGBUILDer Version 2.1.1
# PKGBUILDer Version 2.1.1.1
# A Python AUR helper/library.
# Copyright Kwpolska 2011. Licensed under GPLv3.
# USAGE: ./build.py pkg1 [pkg2] [pkg3] (and more)
Expand All @@ -18,7 +18,7 @@
import subprocess
import datetime

VERSION = '2.1.1'
VERSION = '2.1.1.1'

### PBDS PB global data storage ###
class PBDS:
Expand Down Expand Up @@ -344,9 +344,9 @@ def prepare_deps(self, pkgbuild):
bmdepends = []
makedepends = []
if bashdepends != []:
depends = [ s.rstrip()[1:-1] for s in bashdepends[0][1:-1] ]
depends = [ s.rstrip() for s in bashdepends[0][1:-1] ]
if bmdepends != []:
makedepends = [ s.rstrip()[1:-1] for s in bmdepends[0][1:-1] ]
makedepends = [ s.rstrip() for s in bmdepends[0][1:-1] ]
return depends + makedepends

def depcheck(self, bothdepends):
Expand Down Expand Up @@ -381,7 +381,7 @@ def depcheck(self, bothdepends):
repos = dict((db.name, db) for db in pyalpm.get_syncdbs())
if pkg != None:
parseddeps[dep] = 0
elif pycman.action_sync.find_sync_package(dep, repos):
elif pycman.action_sync.find_sync_package(dep, repos)[0]:
parseddeps[dep] = 1
elif self.utils.info(dep):
parseddeps[dep] = 2
Expand Down Expand Up @@ -415,7 +415,7 @@ def build_runner(self, package):

fancy_msg('Downloading the tarball...')
downloadbytes = self.download(pkginfo['URLPath'], filename)
kbytes = int(downloadbytes) / 1000 #`K' means thousand.
kbytes = int(downloadbytes) / 1000
fancy_msg2('{0} kB downloaded'.format(kbytes))

fancy_msg('Extracting...')
Expand Down
2 changes: 1 addition & 1 deletion scripts/pkgbuilder
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python3.2
#!/usr/bin/env python3
"""Run PKGBUILDer."""
import pkgbuilder
pkgbuilder.main_routine()
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from distutils.core import setup

setup(name='pkgbuilder',
version='2.1.1',
version='2.1.1.1',
description='An AUR helper (and library) in python3',
author='Kwpolska',
author_email='[email protected]',
Expand All @@ -25,7 +25,7 @@
],
py_modules=['pkgbuilder'],
scripts=['scripts/pkgbuilder'],
data_files=[#('bin', ['bin/pkgbuilder']),
data_files=[
('share/man/man8', ['docs/pkgbuilder.8.gz'])
]
)

0 comments on commit 48553c3

Please sign in to comment.