[evolvis-commits] r13472: Use standard Sort:: Versions module to compare database schema version↵ numbers rather than forking dp =?UTF-8?Q?kg=20=2D=2Dcompare=2Dversions?=. This should reduce↵ the need for distro-specific patching?=.=?UTF-8?Q?↵

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Feb 28 02:38:39 CET 2011


Author: mirabilos
Date: 2011-02-28 02:38:39 +0100 (Mon, 28 Feb 2011)
New Revision: 13472

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/deb-specific/sqlhelper.pm
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/control
Log:
Use standard Sort::Versions module to compare database schema version
numbers rather than forking dpkg --compare-versions.  This should reduce
the need for distro-specific patching.


Modified: trunk/gforge_base/evolvisforge-5.1/gforge/deb-specific/sqlhelper.pm
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/deb-specific/sqlhelper.pm	2011-02-28 01:38:34 UTC (rev 13471)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/deb-specific/sqlhelper.pm	2011-02-28 01:38:39 UTC (rev 13472)
@@ -21,6 +21,7 @@
 ### TODO
 
 use strict ;
+use Sort::Versions;
 
 use subs qw/ &get_plugin_id &remove_plugin_from_groups
     &remove_plugin_from_users &drop_table_if_exists
@@ -287,18 +288,14 @@
     my $v1 = shift || 0 ;
     my $v2 = shift || 0 ;
 
-    my $rc = system "dpkg --compare-versions $v1 lt $v2" ;
-
-    return (! $rc) ;
+    return (versioncmp($v1, $v2) < 0) ;
 }
 
 sub is_greater ( $$ ) {
     my $v1 = shift || 0 ;
     my $v2 = shift || 0 ;
 
-    my $rc = system "dpkg --compare-versions $v1 gt $v2" ;
-
-    return (! $rc) ;
+    return (versioncmp($v1, $v2) > 0) ;
 }
 
 1 ;

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog	2011-02-28 01:38:34 UTC (rev 13471)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog	2011-02-28 01:38:39 UTC (rev 13472)
@@ -1,10 +1,15 @@
 gforge (4.8.52-1) experimental; urgency=low
 
+  [ Christian Bayle ]
   * bump to new version because on binary commit
   * put debian postinst/prerm/config/.. files in dsf-in dir
 
- -- Christian Bayle <bayle at debian.org>  Wed, 03 Jun 2009 22:49:58 +0200
+  [ Roland Mas ]
+  * Use standard Sort::Versions module to compare database schema version
+    numbers rather than forking dpkg --compare-versions.
 
+ -- Roland Mas <lolando at debian.org>  Fri, 12 Jun 2009 11:07:25 +0200
+
 gforge (4.8.51-1) experimental; urgency=low
 
   * Fixed blackhole syntax for gforge-mta-exim4 so as not to require

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/control
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/control	2011-02-28 01:38:34 UTC (rev 13471)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/control	2011-02-28 01:38:39 UTC (rev 13472)
@@ -68,7 +68,7 @@
 
 Package: gforge-db-postgresql
 Architecture: all
-Depends: gforge-common, postgresql-8.3 | postgresql-8.2 | postgresql-8.1 | postgresql (>= 8.1), perl, libdbi-perl, libdbd-pg-perl, libmime-base64-perl, libhtml-parser-perl, libtext-autoformat-perl, libmail-sendmail-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, php5-cli, ${misc:Depends}
+Depends: gforge-common, postgresql-8.3 | postgresql-8.2 | postgresql-8.1 | postgresql (>= 8.1), perl, libdbi-perl, libdbd-pg-perl, libmime-base64-perl, libhtml-parser-perl, libtext-autoformat-perl, libmail-sendmail-perl, libsort-versions-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, php5-cli, ${misc:Depends}
 Provides: gforge-db
 Conflicts: gforge-db
 Description: collaborative development tool - database (using PostgreSQL)



More information about the evolvis-commits mailing list