[arch-commits] Commit in buildbot/trunk (PKGBUILD version-parse.patch)

Sergej Pupykin spupykin at archlinux.org
Mon Jan 5 21:29:47 UTC 2015


    Date: Monday, January 5, 2015 @ 22:29:47
  Author: spupykin
Revision: 125456

upgpkg: buildbot 0.8.10-2

upd

Added:
  buildbot/trunk/version-parse.patch
Modified:
  buildbot/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   13 ++++++++++---
 version-parse.patch |   24 ++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-05 21:20:44 UTC (rev 125455)
+++ PKGBUILD	2015-01-05 21:29:47 UTC (rev 125456)
@@ -4,15 +4,22 @@
 
 pkgname=buildbot
 pkgver=0.8.10
-pkgrel=1
+pkgrel=2
 pkgdesc="A system to automate the compile/test cycle required by most software projects"
 arch=('any')
 url="http://buildbot.net"
 license=("GPL")
 depends=('python2-twisted' 'python2-jinja' 'python2-migrate' 'python2-dateutil')
-source=(https://pypi.python.org/packages/source/b/buildbot/buildbot-$pkgver.tar.gz)
-md5sums=('3201aaecf32df7810f4e23c14d20a544')
+source=(https://pypi.python.org/packages/source/b/buildbot/buildbot-$pkgver.tar.gz
+	version-parse.patch)
+md5sums=('3201aaecf32df7810f4e23c14d20a544'
+         '61986f8b1d88ab74c8b290c49580152b')
 
+prepare() {
+  cd "$srcdir"/buildbot-${pkgver/_/}
+  patch -p1 <$srcdir/version-parse.patch
+}
+
 package() {
   cd "$srcdir"/buildbot-${pkgver/_/}
   python2 setup.py install --root="$pkgdir"

Added: version-parse.patch
===================================================================
--- version-parse.patch	                        (rev 0)
+++ version-parse.patch	2015-01-05 21:29:47 UTC (rev 125456)
@@ -0,0 +1,24 @@
+diff -wbBur buildbot-0.8.10.org/buildbot/db/enginestrategy.py buildbot-0.8.10/buildbot/db/enginestrategy.py
+--- buildbot-0.8.10.org/buildbot/db/enginestrategy.py	2014-12-02 19:53:49.000000000 +0300
++++ buildbot-0.8.10/buildbot/db/enginestrategy.py	2015-01-06 00:25:47.462298489 +0300
+@@ -56,7 +56,7 @@
+                 version = "0.6"
+         except:
+             version = "0.0"
+-    return tuple(map(int, version.split('.')))
++    return tuple(map(int, version.split('.')[0:3]))
+ 
+ 
+ class BuildbotEngineStrategy(strategies.ThreadLocalEngineStrategy):
+diff -wbBur buildbot-0.8.10.org/buildbot/db/model.py buildbot-0.8.10/buildbot/db/model.py
+--- buildbot-0.8.10.org/buildbot/db/model.py	2014-12-02 19:53:49.000000000 +0300
++++ buildbot-0.8.10/buildbot/db/model.py	2015-01-06 00:25:59.228965020 +0300
+@@ -499,7 +499,7 @@
+                         version = "0.6"
+                 except:
+                     version = "0.0"
+-            version_tup = tuple(map(int, version.split('.')))
++            version_tup = tuple(map(int, version.split('.')[0:3]))
+             log.msg("using SQLAlchemy-Migrate version %s" % (version,))
+             if version_tup < (0, 6, 1):
+                 raise RuntimeError("You are using SQLAlchemy-Migrate %s. "



More information about the arch-commits mailing list