Author: mzugec
Date: Mon Mar 9 09:28:49 2009
New Revision: 56007
URL: http://svn.opensuse.org/viewcvs/yast?rev=56007&view=rev
Log:
handling of custom modules (see bnc#482424)
Modified:
trunk/http-server/VERSION
trunk/http-server/package/yast2-http-server.changes
trunk/http-server/src/HttpServerWidgets.ycp
Modified: trunk/http-server/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/VERSION?rev=56007&r1=56006&r2=56007&view=diff
==============================================================================
--- trunk/http-server/VERSION (original)
+++ trunk/http-server/VERSION Mon Mar 9 09:28:49 2009
@@ -1 +1 @@
-2.18.2
+2.18.3
Modified: trunk/http-server/package/yast2-http-server.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/package/yast2-http-server.changes?rev=56007&r1=56006&r2=56007&view=diff
==============================================================================
--- trunk/http-server/package/yast2-http-server.changes (original)
+++ trunk/http-server/package/yast2-http-server.changes Mon Mar 9 09:28:49 2009
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Mar 9 09:28:02 CET 2009 - mzugec@suse.cz
+
+- handling of custom modules (see bnc#482424)
+- 2.18.3
+
+-------------------------------------------------------------------
Fri Mar 6 16:49:11 CET 2009 - mzugec@suse.cz
- modules ordering problem (bnc#350590)
Modified: trunk/http-server/src/HttpServerWidgets.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/HttpServerWidgets.ycp?rev=56007&r1=56006&r2=56007&view=diff
==============================================================================
--- trunk/http-server/src/HttpServerWidgets.ycp (original)
+++ trunk/http-server/src/HttpServerWidgets.ycp Mon Mar 9 09:28:49 2009
@@ -2563,10 +2563,10 @@
else if (event["ID"]:nil == `add_user)
{
- string modules_dir=sformat("/usr/%1/apache2-%2/", (Arch::ia64()||Arch::mips64()||Arch::ppc64()||Arch::s390_64()||Arch::sparc64()||Arch::x86_64())?"lib64":"lib", (PackageSystem::Installed("apache2-prefork"))?"prefork":"worker");
+ string module_dirs=sformat("/usr/lib*/apache2/ /usr/lib*/apache2-%2/", (PackageSystem::Installed("apache2-prefork"))?"prefork":"worker");
// list of all installed modules
list <string> all_modules = splitstring(((map