[arch-commits] Commit in hamster-applet/trunk (PKGBUILD python27.patch)

Ionut Biru ibiru at archlinux.org
Thu Nov 4 08:43:43 UTC 2010


    Date: Thursday, November 4, 2010 @ 04:43:42
  Author: ibiru
Revision: 98167

upgpkg: hamster-applet 2.32.0-4
fixes a bug exposed only with python27. Fixes FS#21355

Added:
  hamster-applet/trunk/python27.patch
Modified:
  hamster-applet/trunk/PKGBUILD

----------------+
 PKGBUILD       |    9 ++++++---
 python27.patch |   21 +++++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-11-04 07:38:49 UTC (rev 98166)
+++ PKGBUILD	2010-11-04 08:43:42 UTC (rev 98167)
@@ -4,7 +4,7 @@
 
 pkgname=hamster-applet
 pkgver=2.32.0
-pkgrel=3
+pkgrel=4
 pkgdesc="GNOME time tracking applet"
 arch=('any')
 url="http://projecthamster.wordpress.com/"
@@ -14,12 +14,15 @@
 options=('!libtool' '!emptydirs')
 groups=('gnome-extra')
 install=hamster-applet.install
-source=(ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('416cbacbe7432fd665d5de7d94ab62735b76907b41d1cd73a1bada26c4db01d4')
+source=(ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2
+        python27.patch)
+sha256sums=('416cbacbe7432fd665d5de7d94ab62735b76907b41d1cd73a1bada26c4db01d4'
+            'e2f5ac316b84c600a81b2a3f1cf30c747dd151309edfc305da9d9bdac676302e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" waf
+  patch -Np1 -i "${srcdir}/python27.patch"
 
   ./waf --prefix=/usr configure build
   ./waf install --destdir=${pkgdir} --libdir=/usr/lib \

Added: python27.patch
===================================================================
--- python27.patch	                        (rev 0)
+++ python27.patch	2010-11-04 08:43:42 UTC (rev 98167)
@@ -0,0 +1,21 @@
+From f401d649318e0e01ccefeb99a398a6f32fd820a8 Mon Sep 17 00:00:00 2001
+From: Toms Bauģis <toms.baugis at gmail.com>
+Date: Thu, 04 Nov 2010 00:46:53 +0000
+Subject: not sure how it was working before, really.  fixes bug 633103
+
+---
+diff --git a/src/hamster/db.py b/src/hamster/db.py
+index 5412b58..77e73c3 100644
+--- a/src/hamster/db.py
++++ b/src/hamster/db.py
+@@ -937,7 +937,7 @@ class Storage(storage.Storage):
+     def end_transaction(self):
+         self.__con.commit()
+         self.__cur.close()
+-        self.__con = None
++        self.__con, self.__cur = None, None
+         self.register_modification()
+ 
+     def run_fixtures(self):
+--
+cgit v0.8.3.1




More information about the arch-commits mailing list