October 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r51754 - in /trunk/installation: VERSION package/yast2-installation.changes startup/Second-Stage/S07-medium
by mzugec＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: mzugec Date: Wed Oct 1 16:04:54 2008 New Revision: 51754 URL: http://svn.opensuse.org/viewcvs/yast?rev=51754&view=rev Log: use rpcbind instead of portmap for nfs installation (bnc#423026) Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/startup/Second-Stage/S07-medium Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=51754&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Wed Oct 1 16:04:54 2008 @@ -1 +1 @@ -2.17.15 +2.17.16 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Oct 1 16:04:54 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 1 16:03:32 CEST 2008 - mzugec(a)suse.de + +- use rpcbind instead of portmap for nfs installation (bnc#423026) +- 2.17.16 + +------------------------------------------------------------------- Wed Oct 1 15:41:12 CEST 2008 - jsuchome(a)suse.cz - if nn_NO language is selected, use nb_NO in YaST (bnc#426124) Modified: trunk/installation/startup/Second-Stage/S07-medium URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/Second-Stag… ============================================================================== --- trunk/installation/startup/Second-Stage/S07-medium (original) +++ trunk/installation/startup/Second-Stage/S07-medium Wed Oct 1 16:04:54 2008 @@ -25,7 +25,7 @@ if [ ! -z "$(ls /etc/sysconfig/network/ifcfg-* |grep -v 'ifcfg-lo')" ]; then log "\tnetwork configuration found -> activate network" rcnetwork start -o onboot && Y2_NETWORK_ACTIVE=1 - [ -f /var/lib/YaST2/network_install_portmap ] && rcportmap start + [ -f /var/lib/YaST2/network_install_rpcbind ] && rcrpcbind start fi #============================================= -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r51753 - in /trunk/network: VERSION package/yast2-network.changes src/clients/save_network.ycp
by mzugec＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: mzugec Date: Wed Oct 1 16:03:17 2008 New Revision: 51753 URL: http://svn.opensuse.org/viewcvs/yast?rev=51753&view=rev Log: use rpcbind instead of portmap for nfs installation (bnc#423026) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/save_network.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=51753&r1=517… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Wed Oct 1 16:03:17 2008 @@ -1 +1 @@ -2.17.33 +2.17.34 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Wed Oct 1 16:03:17 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 1 15:57:16 CEST 2008 - mzugec(a)suse.de + +- use rpcbind instead of portmap for nfs installation (bnc#423026) +- 2.17.34 + +------------------------------------------------------------------- Wed Oct 1 14:13:17 CEST 2008 - mzugec(a)suse.de - use Service::Restart instead of bash agent Modified: trunk/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network… ============================================================================== --- trunk/network/src/clients/save_network.ycp (original) +++ trunk/network/src/clients/save_network.ycp Wed Oct 1 16:03:17 2008 @@ -444,7 +444,7 @@ // if portmap running - start it after reboot WFM::Execute (.local.bash, - "pidofproc portmap && touch /var/lib/YaST2/network_install_portmap"); + "pidofproc rpcbind && touch /var/lib/YaST2/network_install_rpcbind"); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r51752 - /trunk/ldap-server/src/complex.ycp
by rhafer＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: rhafer Date: Wed Oct 1 16:01:20 2008 New Revision: 51752 URL: http://svn.opensuse.org/viewcvs/yast?rev=51752&view=rev Log: reformated popup text make the window smaller (bnc#431228) Modified: trunk/ldap-server/src/complex.ycp Modified: trunk/ldap-server/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/complex.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/complex.ycp (original) +++ trunk/ldap-server/src/complex.ycp Wed Oct 1 16:01:20 2008 @@ -170,7 +170,11 @@ } else if ( !serviceEnabled || !serviceRunning ) { - symbol ret = Popup::AnyQuestion3( _("You have an existing configuration but the LDAP Server is not currently running."), _("Do you want to start it now to re-read its configuration data or do you want to create a new configuration from scratch?"), _("Restart"), _("New Configuration"), Label::AbortButton(), `focus_yes ); + symbol ret = Popup::AnyQuestion3( _("Existing configuration detected."), + _("You have an existing configuration, but the LDAP server is currently not running. +Do you want to start the server now and re-read its configuration data or do you +want to create a new configuration from scratch?"), + _("Restart"), _("New Configuration"), Label::AbortButton(), `focus_yes ); if ( ret == `yes ) { LdapServer::WriteServiceEnabled( true ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r51751 - /trunk/packager/src/clients/repositories.ycp
by lslezak＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: lslezak Date: Wed Oct 1 15:58:09 2008 New Revision: 51751 URL: http://svn.opensuse.org/viewcvs/yast?rev=51751&view=rev Log: - fixed problems when only repositories from the selected service were displayed Modified: trunk/packager/src/clients/repositories.ycp Modified: trunk/packager/src/clients/repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositorie… ============================================================================== --- trunk/packager/src/clients/repositories.ycp (original) +++ trunk/packager/src/clients/repositories.ycp Wed Oct 1 15:58:09 2008 @@ -120,6 +120,15 @@ return (priority == default_priority) ? _("Default") : tostring(priority); } + list<map<string,any> > ReposFromService(string service, list<map<string,any> > input) + { + return filter(map<string,any> repo, input, + { + return repo["service"]:"" == service; + } + ); + } + /** Create a table item from a map as returned by the InstSrcManager agent. @param source The map describing the source as returned form the agent. @@ -132,8 +141,8 @@ y2internal("Item: %1", source); - string name = repository_mode ? (haskey(sourceStatesOut[index]:$[], "name") ? - sourceStatesOut[index,"name"]:"" : + string name = repository_mode ? (haskey(source, "name") ? + source["name"]:"" : // unkown name (alias) of the source generalData[ "alias" ]:generalData[ "type" ]: _("Unknown Name")) : source["name"]:""; @@ -169,20 +178,16 @@ map generalData = Pkg::SourceGeneralData( id ); y2milestone("generalData(%1): %2", id, generalData); - string alias = haskey(sourceStatesOut[index]:$[], "name") ? - sourceStatesOut[index,"name"]:"" : - // unkown name (alias) of the source - generalData[ "alias" ]:generalData[ "type" ]: _("Unknown Name"); - // get the editable propertis from 'source' parameter, // get the fixed propertis from the package manager map<string,any> out = $[ "enabled" : source["enabled"]:true, "autorefresh" : source["autorefresh"]:true, - "name" : alias, + "name" : source["name"]:_("Unknown Name"), "url" : generalData[ "url" ]:"", "type" : generalData["type"]:"", "priority" : source["priority"]:default_priority, + "service" : source["service"]:"", ]; return out; @@ -203,16 +208,12 @@ RemoveDeletedAddNewRepos(); } - list<map> itemList = repo_mode ? sourceStatesOut : serviceStatesOut; + list<map<string,any> > itemList = repo_mode ? sourceStatesOut : serviceStatesOut; // displaye only repositories from the selected service if (repo_mode && service_name != "") { - itemList = filter(map repo, itemList, - { - return repo["service"]:"" == service_name; - } - ); + itemList = ReposFromService(service_name, itemList); y2internal("table items: %1", itemList); } @@ -225,6 +226,8 @@ i = i + 1; } + y2internal("New table content: %1", items); + UI::ChangeWidget( `id( `table ), `Items, items ); } @@ -260,6 +263,8 @@ void fillRepoInfo(integer index, map source, boolean repo_mode, string service_name) { + y2internal(-1, "fillRepoInfo: index: %1, source; %2, repo_mode: %3, service_name: %4", + index, source, repo_mode, service_name); map<string,any> info = repo_mode ? getSourceInfo (index, source) : source; y2internal("getSourceInfo(%1, %2): %3", index, source, info); @@ -277,7 +282,7 @@ if (service != "") { - sformat (_("Service: %1"), service); + service = sformat (_("Service: %1"), service); } // don't display category for services @@ -340,7 +345,11 @@ return; } - map data = (repository_view) ? sourceStatesOut[selected]:$[] : serviceStatesOut[selected]:$[]; + map data = (repository_view) ? + ((displayed_service == "") ? sourceStatesOut[selected]:$[] : + ReposFromService(displayed_service, sourceStatesOut)[selected]:$[] + ) + : serviceStatesOut[selected]:$[]; fillRepoInfo (selected, data, repository_view, displayed_service); } @@ -843,25 +852,31 @@ map<string, any> sourceState = $[]; + // global_current - 'current' that points to global sourceStatesOut + integer global_current = -1; + if (repository_view) { if (displayed_service == "") { sourceState = sourceStatesOut[ current ]:$[]; + global_current = current; } else { if (current != nil) { - list<map<string,any> > sources_from_service = sourceStatesOut; + list<map<string,any> > sources_from_service = ReposFromService(displayed_service, sourceStatesOut); + sourceState = sources_from_service[current]:$[]; - sources_from_service = filter(map<string,any> src, sources_from_service, + find(map<string,any> s, sourceStatesOut, { - return src["service"]:"" == displayed_service; + global_current = global_current + 1; + return s["SrcId"]:nil == sourceState["SrcId"]:-1; } ); - sourceState = sources_from_service[current]:$[]; + y2milestone("global_current: %1", global_current); } } } @@ -997,11 +1012,15 @@ } else if ( input == `autorefresh_all || input == `refresh_enabled) { - y2milestone("Refreshing all %1 repositories...", input == `refresh_enabled ? "enabled" : "autorefreshed"); + y2milestone("Refreshing all %1 %2%3...", input == `refresh_enabled ? "enabled" : "autorefreshed", + repository_view ? "repositories" : "services", + repository_view && displayed_service != "" ? " from service " + displayed_service : ""); boolean refresh_autorefresh_only = input == `autorefresh_all; integer to_refresh = 0; +// TODO FIXME list<map<string,any> > data = + foreach(map<string,any> src_state, sourceStatesOut, { if (src_state["enabled"]:false && (!refresh_autorefresh_only || src_state["autorefresh"]:false)) @@ -1101,7 +1120,7 @@ string newstate = ( state ? UI::Glyph (`CheckMark) : ""); UI::ChangeWidget( `id( `table ), `Item( current, 1 ), newstate ); sourceState[ "enabled" ] = state; - sourceStatesOut[ current ] = sourceState; + sourceStatesOut[ global_current ] = sourceState; if (full_mode) { @@ -1135,14 +1154,14 @@ { integer source_id = sourceState["SrcId"]:0; map src_data = Pkg::SourceGeneralData (source_id); - string type = src_data["type"]:"UnitedLinux"; + string type = src_data["type"]:""; boolean state = sourceState[ "autorefresh" ]:true; if (type == "PlainDir" && ! state) { // popup message Popup::Message (_("For the selected repository, refresh - cannot be set.")); +cannot be set.")); } else { @@ -1153,27 +1172,23 @@ } sourceState["autorefresh"] = state; - sourceStatesOut[ current ] = sourceState; + sourceStatesOut[ global_current ] = sourceState; } else { - if (displayed_service == "") - { - map<string,any> srv = serviceStatesOut[current]:$[]; - y2internal("Selected service: %1", srv); + map<string,any> srv = serviceStatesOut[current]:$[]; + y2internal("Selected service: %1", srv); - boolean state = srv["autorefresh"]:false; - state = !state; + boolean state = srv["autorefresh"]:false; + state = !state; - // update the table - string newstate = ( state ? UI::Glyph (`CheckMark) : ""); - UI::ChangeWidget( `id( `table ), `Item( current, 1 ), newstate ); + // update the table + string newstate = ( state ? UI::Glyph (`CheckMark) : ""); + UI::ChangeWidget( `id( `table ), `Item( current, 1 ), newstate ); - // store the change - srv["autorefresh"] = state; - serviceStatesOut[current] = srv; - } - // TODO else... + // store the change + srv["autorefresh"] = state; + serviceStatesOut[current] = srv; } // do not refresh the item in the table @@ -1181,16 +1196,23 @@ } else if (input == `priority) { - // refresh the value in the table - integer new_priority = (integer)UI::QueryWidget(`id(`priority), `Value); - y2debug("New priority: %1", new_priority); - - UI::ChangeWidget( `id( `table ), `Item( current, 0 ), PriorityToString(new_priority)); - sourceState[ "priority" ] = new_priority; - sourceStatesOut[ current ] = sourceState; + if (repository_view) + { + // refresh the value in the table + integer new_priority = (integer)UI::QueryWidget(`id(`priority), `Value); + y2debug("New priority: %1", new_priority); + + UI::ChangeWidget( `id( `table ), `Item( current, 0 ), PriorityToString(new_priority)); + sourceState[ "priority" ] = new_priority; + sourceStatesOut[ global_current ] = sourceState; - // do not refresh the item in the table - current = -1; + // do not refresh the item in the table + current = -1; + } + else + { + y2error("Ignoring event `priority: the widget should NOT be displayed in service mode!"); + } } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r51750 - in /trunk/ldap-server/src: dialogs.ycp wizards.ycp
by rhafer＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: rhafer Date: Wed Oct 1 15:46:49 2008 New Revision: 51750 URL: http://svn.opensuse.org/viewcvs/yast?rev=51750&view=rev Log: use correct Icon (bnc#431210) Modified: trunk/ldap-server/src/dialogs.ycp trunk/ldap-server/src/wizards.ycp Modified: trunk/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/dialogs.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/dialogs.ycp (original) +++ trunk/ldap-server/src/dialogs.ycp Wed Oct 1 15:46:49 2008 @@ -322,6 +322,7 @@ //close service dialog // UI::CloseDialog(); Wizard::CreateTreeDialog(); + Wizard::SetDesktopIcon("ldap-server"); //item selected at start current_tree_item = "daemon"; Modified: trunk/ldap-server/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/wizards.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/wizards.ycp (original) +++ trunk/ldap-server/src/wizards.ycp Wed Oct 1 15:46:49 2008 @@ -44,6 +44,7 @@ ] ]; + Wizard::SetDesktopIcon("ldap-server"); any ret = Sequencer::Run(aliases, sequence); UI::CloseDialog(); return ret; @@ -55,6 +56,7 @@ term contents = `Label(_("Initializing...")); Wizard::CreateDialog(); + Wizard::SetDesktopIcon("ldap-server"); Wizard::SetContentsButtons(caption, contents, "", Label::BackButton(), Label::NextButton()); @@ -95,6 +97,7 @@ term contents = `Label(_("Initializing...")); Wizard::CreateDialog(); + Wizard::SetDesktopIcon("ldap-server"); Wizard::SetContentsButtons(caption, contents, "", Label::BackButton(), Label::NextButton()); @@ -183,6 +186,7 @@ y2milestone( "--> starting MigrateSequence" ); Wizard::CreateDialog(); + Wizard::SetDesktopIcon("ldap-server"); any ret = Sequencer::Run(aliases, sequence); y2milestone( "--> MigrateSequence finished " ); @@ -240,6 +244,7 @@ ]; Wizard::CreateDialog(); + Wizard::SetDesktopIcon("ldap-server"); any ret = Sequencer::Run(aliases, sequence); @@ -262,6 +267,7 @@ y2milestone ( "--> starting LdapServerAutoSequence" ); Wizard::CreateDialog(); + Wizard::SetDesktopIcon("ldap-server"); Wizard::SetContentsButtons(caption, contents, "", Label::BackButton(), Label::NextButton()); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r51749 - in /trunk/installation: package/yast2-installation.changes src/clients/inst_complex_welcome.ycp
by jsuchome＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: jsuchome Date: Wed Oct 1 15:43:09 2008 New Revision: 51749 URL: http://svn.opensuse.org/viewcvs/yast?rev=51749&view=rev Log: - if nn_NO language is selected, use nb_NO in YaST (bnc#426124) Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_complex_welcome.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Oct 1 15:43:09 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Oct 1 15:41:12 CEST 2008 - jsuchome(a)suse.cz + +- if nn_NO language is selected, use nb_NO in YaST (bnc#426124) + +------------------------------------------------------------------- Wed Oct 1 13:42:18 CEST 2008 - locilka(a)suse.cz - Changing pattern "Documentation" to "documentation" (bnc #431218) Modified: trunk/installation/src/clients/inst_complex_welcome.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_co… ============================================================================== --- trunk/installation/src/clients/inst_complex_welcome.ycp (original) +++ trunk/installation/src/clients/inst_complex_welcome.ycp Wed Oct 1 15:43:09 2008 @@ -239,7 +239,14 @@ Language::WfmSetGivenLanguage ("en_US"); } else if (ret == `language) { Console::SelectFont (language); - Language::WfmSetLanguage (); + // no yast translation for nn_NO, use nb_NO as a backup + if (language == "nn_NO") + { + y2milestone ("Nynorsk not translated, using BokmÃ¥l"); + Language::WfmSetGivenLanguage ("nb_NO"); + } + else + Language::WfmSetLanguage (); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r51748 - /tags/stable-2_17_11/ldap-client/
by jsuchome＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: jsuchome Date: Wed Oct 1 15:35:59 2008 New Revision: 51748 URL: http://svn.opensuse.org/viewcvs/yast?rev=51748&view=rev Log: Created tag stable-2_17_11 for ldap-client Added: tags/stable-2_17_11/ldap-client/ - copied from r51747, trunk/ldap-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r51747 - in /trunk/ldap-client: VERSION package/yast2-ldap-client.changes src/LdapPopup.ycp
by jsuchome＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: jsuchome Date: Wed Oct 1 15:35:55 2008 New Revision: 51747 URL: http://svn.opensuse.org/viewcvs/yast?rev=51747&view=rev Log: - fixed help text (bnc#430521) - 2.17.11 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/LdapPopup.ycp Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=51747&r1… ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Wed Oct 1 15:35:55 2008 @@ -1 +1 @@ -2.17.10 +2.17.11 Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-c… ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Wed Oct 1 15:35:55 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 1 15:11:55 CEST 2008 - jsuchome(a)suse.cz + +- fixed help text (bnc#430521) +- 2.17.11 + +------------------------------------------------------------------- Thu Sep 25 09:07:58 CEST 2008 - jsuchome(a)suse.cz - do not restart dbus service, reload it (bnc#429520) Modified: trunk/ldap-client/src/LdapPopup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/LdapPopup.ycp?re… ============================================================================== --- trunk/ldap-client/src/LdapPopup.ycp (original) +++ trunk/ldap-client/src/LdapPopup.ycp Wed Oct 1 15:35:55 2008 @@ -577,7 +577,7 @@ _("If the existing password must be provided along with the new password, check Old Password Required for Password Change.") + // help text for pwdCheckQuality attribute - _("Select whether the password quality should be verified while passwords are modified or added. Select No Checking if passwords should not be checked at all. With Accept Uncheckable Passwords, passwords are accepted even if the check cannot be performed, for example, if the user has provided an encrypted password. With Only Accept Checked Passwords passwords are refused if the quality test fails or the password cannot be checked.") + + _("Select whether the password quality should be verified while passwords are modified or added. Select No Checking if passwords should not be checked at all. With Accept Uncheckable Passwords, passwords are accepted even if the check cannot be performed, for example, if the user has provided an encrypted password. With Only Accept Checked Passwords passwords are refused if the quality test fails or the password cannot be checked.") + // help text for pwdMinLength attribute _("Set the minimum number of characters that must be used in a password in Minimum Password Length."), -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r51746 - /trunk/devtools/yast2/check_ycp/check_ycp
by sh-sh-sh＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: sh-sh-sh Date: Wed Oct 1 15:34:25 2008 New Revision: 51746 URL: http://svn.opensuse.org/viewcvs/yast?rev=51746&view=rev Log: removed counterproductive check Modified: trunk/devtools/yast2/check_ycp/check_ycp Modified: trunk/devtools/yast2/check_ycp/check_ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/yast2/check_ycp/check_y… ============================================================================== --- trunk/devtools/yast2/check_ycp/check_ycp (original) +++ trunk/devtools/yast2/check_ycp/check_ycp Wed Oct 1 15:34:25 2008 @@ -385,15 +385,6 @@ my $line_no = count_lines( $header ) + 1; - # Check for $ Id $ marker - - if ( $header !~ m{[\$]Id.*[\$]}m ) - { - warning( $line_no, "No \$" . "Id" . "\$ CVS/Subversion marker in header" ); - - } - - # Check for "Author(s)" or "Maintainer(s)" entries my $author_count = 0; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r51745 - in /trunk/ldap-server/src: LdapServer.pm agent/SlapdConfigAgent.cc
by rhafer＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: rhafer Date: Wed Oct 1 15:14:00 2008 New Revision: 51745 URL: http://svn.opensuse.org/viewcvs/yast?rev=51745&view=rev Log: fixed test if the configration is still using the defaults-hash or if it has been read from libslapdconf (bnc#431250) Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/agent/SlapdConfigAgent.cc Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Wed Oct 1 15:14:00 2008 @@ -34,6 +34,7 @@ my %error = ( msg => undef, details => undef ); my $usingDefaults = 1; +my $readConfig = 0; my $configured = 0; my $usesBackConfig = 0; my $slapdConfChanged = 0; @@ -231,6 +232,7 @@ SCR->Execute('.ldapserver.init' ); my $rc = SCR->Read('.ldapserver.databases'); $usingDefaults = 0; + $readConfig = 1; } else { @@ -936,7 +938,7 @@ # Configuration summary text for autoyast my $self = shift; my $string; - if ( keys(%dbDefaults) && $usingDefaults ) + if ( keys(%dbDefaults) && ! $readConfig ) { $string .= '<h2>'._("Startup Configuration").'</h2>' .''._("Start LDAP Server: ").'<code>'.($dbDefaults{'serviceEnabled'}->value?_("Yes"):_("No")).'</code>' @@ -1421,6 +1423,7 @@ { bind_dn => $dbDefaults{'rootdn'}, bind_pw => $dbDefaults{'rootpw_clear'} } ); $usingDefaults = 0; + $readConfig = 1; return 1; } Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Wed Oct 1 15:14:00 2008 @@ -111,6 +111,7 @@ return ConfigToLdif(); } } catch ( std::runtime_error e ) { + y2error("Error during Read: %s", e.what() ); lastError->add(YCPString("summary"), YCPString(std::string( e.what() ) ) ); lastError->add(YCPString("description"), YCPString("") ); return YCPBoolean(false); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0