Author: mzugec Date: Thu Apr 24 22:19:58 2008 New Revision: 47047 URL: http://svn.opensuse.org/viewcvs/yast?rev=47047&view=rev Log: fixed SCR agent for slp.reg.d/* files (bnc#374310) -This line, and those below, will be ignored-- M slp-server/agents/slp_reg.scr M slp-server/VERSION M slp-server/src/dialogs.ycp M slp-server/package/yast2-slp-server.changes Modified: trunk/slp-server/VERSION trunk/slp-server/agents/slp_reg.scr trunk/slp-server/package/yast2-slp-server.changes trunk/slp-server/src/dialogs.ycp Modified: trunk/slp-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp-server/VERSION?rev=47047&r1=47046&r2=47047&view=diff ============================================================================== --- trunk/slp-server/VERSION (original) +++ trunk/slp-server/VERSION Thu Apr 24 22:19:58 2008 @@ -1 +1 @@ -2.16.1 +2.16.2 Modified: trunk/slp-server/agents/slp_reg.scr URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp-server/agents/slp_reg.scr?rev=47047&r1=47046&r2=47047&view=diff ============================================================================== --- trunk/slp-server/agents/slp_reg.scr (original) +++ trunk/slp-server/agents/slp_reg.scr Thu Apr 24 22:19:58 2008 @@ -40,9 +40,9 @@ // $[ "match" : [ "^[#;][ \t]*([^ \t]+)[ \t]+([^ \t]+)[ \t]+$", "%s %s" ]], $[ "match" : [ "^[#;][ \t]*([^ \t\=]+)[ \t\=:]+(.+)[ \t]*$", "; %s %s" ]], // Options with more possible values - $[ "match" : [ "^[ \t]*([^ \t\=]+)[ \t\=]+[ ]*(.+)[ \t]*$", "%s %s" ]], + $[ "match" : [ "^[ \t]*([^ \t\=]+)[ \t\=]+[ ]*(.+)[ \t]*$", "%s=%s" ]], - $[ "match" : [ "^[ \t]*([^ \t:]+)[ \t\:]+[ ]*(.+)[ \t]*$", "%s %s" ]], +// $[ "match" : [ "^[ \t]*([^ \t:]+)[ \t\:]+[ ]*(.+)[ \t]*$", "%s %s" ]], ], ] ) Modified: trunk/slp-server/package/yast2-slp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp-server/package/yast2-slp-server.changes?rev=47047&r1=47046&r2=47047&view=diff ============================================================================== --- trunk/slp-server/package/yast2-slp-server.changes (original) +++ trunk/slp-server/package/yast2-slp-server.changes Thu Apr 24 22:19:58 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Apr 24 21:53:30 CEST 2008 - mzugec@suse.cz + +- fixed SCR agent for slp.reg.d/* files (bnc#374310) +- 2.16.2 + +------------------------------------------------------------------- Mon Mar 17 12:43:32 CET 2008 - jsrain@suse.cz - added 'StartupNotify=true' to the desktop file (bnc #304964) Modified: trunk/slp-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp-server/src/dialogs.ycp?rev=47047&r1=47046&r2=47047&view=diff ============================================================================== --- trunk/slp-server/src/dialogs.ycp (original) +++ trunk/slp-server/src/dialogs.ycp Thu Apr 24 22:19:58 2008 @@ -21,6 +21,8 @@ import "TablePopup"; import "LogView"; import "IP"; +import "String"; + include "slp-server/helps.ycp"; void initServerSettings(string key); @@ -554,7 +556,7 @@ else if (SlpServer::slp_config["net.slp.isbroadcastonly"]:"false" == "true") mode = `bc; else - if (size(SlpServer::slp_config["net.slp.daaddresses"]:"")>0) mode = `da; + if (size(String::CutBlanks(SlpServer::slp_config["net.slp.daaddresses"]:""))>0) mode = `da; else mode = `mc; UI::ChangeWidget(`id(`resp), `CurrentButton, mode); changeResponseTo(mode); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org