v2.1.4.1: fixes #1. Removes the useless msgcodes.

Also, it would be a good idea to check out pkgbuilder-git from the AUR if you want some additional fixes between releases, but note that it is likely to break, as I often push half-baked versions because I do all the testing on my local machine rather than a shell server, which I sometimes use for development. Signed-off-by: Kwpolska <[email protected]>
Kwpolska · Sep 8, 2012 · 62c0b92 · 62c0b92
1 parent c9427a3
commit 62c0b92
Show file tree

Hide file tree

Showing 40 changed files with 493 additions and 483 deletions.
diff --git a/.pbwrapperhelp b/.pbwrapperhelp
@@ -1,79 +1,3 @@
-usage:  pacman <operation> [...]
-operations:
-    pacman {-h --help}
-    pacman {-V --version}
-    pacman {-D --database} <options> <package(s)>
-    pacman {-Q --query}    [options] [package(s)]
-    pacman {-R --remove}   [options] <package(s)>
-    pacman {-S --sync}     [options] [package(s)]
-    pacman {-T --deptest}  [options] [package(s)]
-    pacman {-U --upgrade}  [options] <file(s)>
-
-use 'pacman {-h --help}' with an operation for available options
-usage:  pacman {-D --database} <options> <package(s)>
-options:
-  -b, --dbpath <path>  set an alternate database location
-  -r, --root <path>    set an alternate installation root
-  -v, --verbose        be verbose
-      --arch <arch>    set an alternate architecture
-      --asdeps         mark packages as non-explicitly installed
-      --asexplicit     mark packages as explicitly installed
-      --cachedir <dir> set an alternate package cache location
-      --config <path>  set an alternate configuration file
-      --debug          display debug messages
-      --gpgdir <path>  set an alternate home directory for GnuPG
-      --logfile <path> set an alternate log file
-      --noconfirm      do not ask for any confirmation
-usage:  pacman {-Q --query} [options] [package(s)]
-options:
-  -b, --dbpath <path>  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 <file>    query the package that owns <file>
-  -p, --file <package> query a package file instead of the database
-  -q, --quiet          show less information for query and search
-  -r, --root <path>    set an alternate installation root
-  -s, --search <regex> 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 <arch>    set an alternate architecture
-      --cachedir <dir> set an alternate package cache location
-      --config <path>  set an alternate configuration file
-      --debug          display debug messages
-      --gpgdir <path>  set an alternate home directory for GnuPG
-      --logfile <path> set an alternate log file
-      --noconfirm      do not ask for any confirmation
-usage:  pacman {-R --remove} [options] <package(s)>
-options:
-  -b, --dbpath <path>  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 <path>    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 <arch>    set an alternate architecture
-      --cachedir <dir> set an alternate package cache location
-      --config <path>  set an alternate configuration file
-      --dbonly         only modify database entries, not package files
-      --debug          display debug messages
-      --gpgdir <path>  set an alternate home directory for GnuPG
-      --logfile <path> 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 <string>
-                       specify how the targets should be printed
 usage:  pacman {-S --sync} [options] [package(s)]
 options:
   -b, --dbpath <path>  set an alternate database location
@@ -109,41 +33,31 @@ options:
       --noscriptlet    do not execute the install scriptlet if one exists
       --print-format <string>
                        specify how the targets should be printed
-usage:  pacman {-T --deptest} [options] [package(s)]
-options:
-  -b, --dbpath <path>  set an alternate database location
-  -r, --root <path>    set an alternate installation root
-  -v, --verbose        be verbose
-      --arch <arch>    set an alternate architecture
-      --cachedir <dir> set an alternate package cache location
-      --config <path>  set an alternate configuration file
-      --debug          display debug messages
-      --gpgdir <path>  set an alternate home directory for GnuPG
-      --logfile <path> set an alternate log file
-      --noconfirm      do not ask for any confirmation
-usage:  pacman {-U --upgrade} [options] <file(s)>
+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 <path>  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 <path>    set an alternate installation root
-  -v, --verbose        be verbose
-      --arch <arch>    set an alternate architecture
-      --asdeps         install packages as non-explicitly installed
-      --asexplicit     install packages as explicitly installed
-      --cachedir <dir> set an alternate package cache location
-      --config <path>  set an alternate configuration file
-      --dbonly         only modify database entries, not package files
-      --debug          display debug messages
-      --gpgdir <path>  set an alternate home directory for GnuPG
-      --ignore <pkg>   ignore a package upgrade (can be used more than once)
-      --ignoregroup <grp>
-                       ignore a group upgrade (can be used more than once)
-      --logfile <path> 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 <string>
-                       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
@@ -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
@@ -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
@@ -1,6 +1,6 @@
 # Maintainer: Kwpolska <[email protected]>
 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
@@ -0,0 +1,38 @@
+# Maintainer: Kwpolska <[email protected]>
+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
@@ -4,7 +4,7 @@ PKGBUILDer.  An AUR helper (and library) in Python 3.
 :Info: This is the README file for PKGBUILDer.
 :Author: Kwpolska <[email protected]>
 :Date: 2012-09-08
-:Version: 2.1.4.0
+:Version: 2.1.4.1
 
 .. index: README
 

diff --git 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 <[email protected]>
 :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
diff --git a/dist/pkgbuilder-2.1.4.1.tar.gz b/dist/pkgbuilder-2.1.4.1.tar.gz
diff --git 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 <[email protected]>
 :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
@@ -4,7 +4,7 @@ Appendix B. License for PKGBUILDer
 :Info: This is an appendix to the PKGBUILDer documentation.
 :Author: Kwpolska <[email protected]>
 :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
@@ -4,7 +4,7 @@ PKGBUILDer.  An AUR helper (and library) in Python 3.
 :Info: This is the README file for PKGBUILDer.
 :Author: Kwpolska <[email protected]>
 :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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/docs/pb.rst b/docs/pb.rst
@@ -5,7 +5,7 @@ PBWrapper
 :Author: Kwpolska <[email protected]>
 :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
@@ -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
diff --git a/docs/pkgbuilder.rst b/docs/pkgbuilder.rst
@@ -5,7 +5,7 @@ PKGBUILDer
 :Author: Kwpolska <[email protected]>
 :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
@@ -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
@@ -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
@@ -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