deskbar-applet r2003 - in trunk: . deskbar/handlers
- From: sebp svn gnome org
- To: svn-commits-list gnome org
- Subject: deskbar-applet r2003 - in trunk: . deskbar/handlers
- Date: Tue, 11 Mar 2008 13:44:33 +0000 (GMT)
Author: sebp
Date: Tue Mar 11 13:44:32 2008
New Revision: 2003
URL: http://svn.gnome.org/viewvc/deskbar-applet?rev=2003&view=rev
Log:
Fixed: Detect tomboy version correctly
Modified:
trunk/ChangeLog
trunk/NEWS
trunk/configure.ac
trunk/deskbar/handlers/tomboy.py
Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS (original)
+++ trunk/NEWS Tue Mar 11 13:44:32 2008
@@ -2,6 +2,15 @@
deskbar-applet 2.22.0
=======================
+Changes:
+ * Fixed: Detect tomboy version correctly
+
+Contributors to this release: Sebastian PÃlsterl
+
+=======================
+deskbar-applet 2.22.0
+=======================
+
This is the first release of the stable 2.22 series
and just includes bug fixes compared to version 2.21.92.
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Tue Mar 11 13:44:32 2008
@@ -1,4 +1,4 @@
-AC_INIT(deskbar-applet, 2.22.0, rslinckx gnome org)
+AC_INIT(deskbar-applet, 2.22.0.1, rslinckx gnome org)
AC_CONFIG_SRCDIR(deskbar/__init__.py)
AC_CONFIG_HEADERS(config.h)
AC_CONFIG_MACRO_DIR([m4])
Modified: trunk/deskbar/handlers/tomboy.py
==============================================================================
--- trunk/deskbar/handlers/tomboy.py (original)
+++ trunk/deskbar/handlers/tomboy.py Tue Mar 11 13:44:32 2008
@@ -209,22 +209,18 @@
read = command.read()
command.close()
- line_regexp = re.compile( 'Version \d\.\d\.\d', re.IGNORECASE )
+ line_regexp = re.compile( 'Version (\d+?)\.(\d+?)\.(\d+?)', re.IGNORECASE )
results_list = line_regexp.findall( read )
if len(results_list) == 0:
return '0.0.0'
else:
- version_line = results_list[0].strip()
- number_regexp = re.compile( '\d\.\d\.\d' )
- version = number_regexp.findall( version_line )[0]
- return version
+ return [int(i) for i in results_list[0]]
# Check if version is correct
def tomboy_correct_version():
wanted = "0.9.2"
- actual = get_tomboy_version()
- _wanted = wanted.split(".")
- _actual = actual.split(".")
+ _actual = get_tomboy_version()
+ _wanted = [int(i) for i in wanted.split(".")]
if _actual[0] > _wanted[0]:
return True
elif _actual[0] == _wanted[0]:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]