richard: server/kolab-webadmin/kolab-webadmin/www/admin/kolab versions.php.in, 1.9, 1.10

cvs at kolab.org cvs at kolab.org
Sun Feb 17 15:15:59 CET 2008


Author: richard

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/kolab
In directory doto:/tmp/cvs-serv8692/www/admin/kolab

Modified Files:
	versions.php.in 
Log Message:
moved an openpkg specific rpm package into a test that is enabled when run
on an openpkg installation.  This way the page shows up, much faster on native
pkg installations



Index: versions.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/kolab/versions.php.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- versions.php.in	16 Feb 2008 18:28:56 -0000	1.9
+++ versions.php.in	17 Feb 2008 14:15:57 -0000	1.10
@@ -44,12 +44,12 @@
     sort
 ');
 
-$kolabpatchedversions = shell_exec("@RPM@ -qa|grep 'kolab[0-9]*$'" );
 
 # This is an openpkg test, difficult to see after make.
 # but visible in the vanilla sources.
 if ("@WITHOPENPKG@" == "yes") {
-	$openpkgversion = shell_exec("@RPM@ -q openpkg");
+  $openpkgversion = shell_exec("@RPM@ -q openpkg");
+  $kolabpatchedversions = shell_exec("@RPM@ -qa|grep 'kolab[0-9]*$'" );
 }
 
 $kolabversion = '@kolab_version@';





More information about the commits mailing list