November 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41926 - /branches/SuSE-SLE-10-SP2-Branch/network/src/modules/Host.ycp
by kmachalkova＠svn.opensuse.org 09 Nov '07

09 Nov '07

Author: kmachalkova Date: Fri Nov 9 14:43:19 2007 New Revision: 41926 URL: http://svn.opensuse.org/viewcvs/yast?rev=41926&view=rev Log: Filter out host IPs with empty hostname so that valid autoyast profile is created (#335120) Modified: branches/SuSE-SLE-10-SP2-Branch/network/src/modules/Host.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/network/src/modules/Host.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/networ… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/network/src/modules/Host.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/network/src/modules/Host.ycp Fri Nov 9 14:43:19 2007 @@ -145,6 +145,11 @@ global define map Export() { if (size(hosts)>0) { + //Filter out IPs with empty hostname (so that valid autoyast + //profile is created)(#335120) + hosts = filter ( string ip, list <string> names, hosts,{ + return (names != []); + }); return $[ "hosts": eval(hosts), ]; -- 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] r41925 - /trunk/network/src/modules/Host.ycp
by kmachalkova＠svn.opensuse.org 09 Nov '07

09 Nov '07

Author: kmachalkova Date: Fri Nov 9 14:40:14 2007 New Revision: 41925 URL: http://svn.opensuse.org/viewcvs/yast?rev=41925&view=rev Log: Filter out host IPs with empty hostname so that valid autoyast profile is created (#335120) Modified: trunk/network/src/modules/Host.ycp Modified: trunk/network/src/modules/Host.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Host.ycp?rev… ============================================================================== --- trunk/network/src/modules/Host.ycp (original) +++ trunk/network/src/modules/Host.ycp Fri Nov 9 14:40:14 2007 @@ -161,6 +161,11 @@ global define map Export() { if (size(hosts)>0) { + //Filter out IPs with empty hostname (so that valid autoyast + //profile is created)(#335120) + hosts = filter ( string ip, list <string> names, hosts,{ + return (names != []); + }); return $[ "hosts": eval(hosts), ]; -- 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] r41924 - /branches/SuSE-SLE-10-SP2-Branch/network/src/config/host.rnc
by kmachalkova＠svn.opensuse.org 09 Nov '07

09 Nov '07

Author: kmachalkova Date: Fri Nov 9 14:31:42 2007 New Revision: 41924 URL: http://svn.opensuse.org/viewcvs/yast?rev=41924&view=rev Log: Modified to accept empty section as valid (#335120) Modified: branches/SuSE-SLE-10-SP2-Branch/network/src/config/host.rnc Modified: branches/SuSE-SLE-10-SP2-Branch/network/src/config/host.rnc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/networ… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/network/src/config/host.rnc (original) +++ branches/SuSE-SLE-10-SP2-Branch/network/src/config/host.rnc Fri Nov 9 14:31:42 2007 @@ -9,13 +9,13 @@ host = element host { - hosts + hosts? } hosts = element hosts { LIST, - hosts_entry+ + hosts_entry* } hosts_entry = -- 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] r41923 - /trunk/network/src/config/host.rnc
by kmachalkova＠svn.opensuse.org 09 Nov '07

09 Nov '07

Author: kmachalkova Date: Fri Nov 9 14:31:27 2007 New Revision: 41923 URL: http://svn.opensuse.org/viewcvs/yast?rev=41923&view=rev Log: Modified to accept empty section as valid (#335120) Modified: trunk/network/src/config/host.rnc Modified: trunk/network/src/config/host.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/config/host.rnc?rev=… ============================================================================== --- trunk/network/src/config/host.rnc (original) +++ trunk/network/src/config/host.rnc Fri Nov 9 14:31:27 2007 @@ -9,13 +9,13 @@ host = element host { - hosts + hosts? } hosts = element hosts { LIST, - hosts_entry+ + hosts_entry* } hosts_entry = -- 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] r41921 - /tags/branch-SLE-10-SP2-2_13_34/
by mcalmer＠svn.opensuse.org 09 Nov '07

09 Nov '07

Author: mcalmer Date: Fri Nov 9 14:01:32 2007 New Revision: 41921 URL: http://svn.opensuse.org/viewcvs/yast?rev=41921&view=rev Log: Created tag branch-SLE-10-SP2-2_13_34 Added: tags/branch-SLE-10-SP2-2_13_34/ -- 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] r41922 - /tags/branch-SLE-10-SP2-2_13_34/ca-management/
by mcalmer＠svn.opensuse.org 09 Nov '07

09 Nov '07

Author: mcalmer Date: Fri Nov 9 14:01:32 2007 New Revision: 41922 URL: http://svn.opensuse.org/viewcvs/yast?rev=41922&view=rev Log: Created tag branch-SLE-10-SP2-2_13_34 for ca-management Added: tags/branch-SLE-10-SP2-2_13_34/ca-management/ - copied from r41921, branches/SuSE-SLE-10-SP2-Branch/ca-management/ -- 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] r41920 - in /branches/SuSE-SLE-10-SP2-Branch/ca-management: VERSION package/yast2-ca-management.changes src/YaPI/CaManagement.pm src/util.ycp
by mcalmer＠svn.opensuse.org 09 Nov '07

09 Nov '07

Author: mcalmer Date: Fri Nov 9 14:01:15 2007 New Revision: 41920 URL: http://svn.opensuse.org/viewcvs/yast?rev=41920&view=rev Log: - version 2.13.34 - fix importCA [#337524] - Enable cloning of CA-management for use with AutoYaST [FATE #302080] Modified: branches/SuSE-SLE-10-SP2-Branch/ca-management/VERSION branches/SuSE-SLE-10-SP2-Branch/ca-management/package/yast2-ca-management.changes branches/SuSE-SLE-10-SP2-Branch/ca-management/src/YaPI/CaManagement.pm branches/SuSE-SLE-10-SP2-Branch/ca-management/src/util.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/ca-management/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/ca-man… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/ca-management/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/ca-management/VERSION Fri Nov 9 14:01:15 2007 @@ -1 +1 @@ -2.13.33 +2.13.34 Modified: branches/SuSE-SLE-10-SP2-Branch/ca-management/package/yast2-ca-management.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/ca-man… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/ca-management/package/yast2-ca-management.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/ca-management/package/yast2-ca-management.changes Fri Nov 9 14:01:15 2007 @@ -1,7 +1,10 @@ ------------------------------------------------------------------- Wed Nov 7 10:37:49 CET 2007 - mc(a)suse.de +- version 2.13.34 +- fix importCA [#337524] - Enable cloning of CA-management for use with AutoYaST + [FATE #302080] ------------------------------------------------------------------- Wed Oct 10 12:39:02 CEST 2007 - mc(a)suse.de Modified: branches/SuSE-SLE-10-SP2-Branch/ca-management/src/YaPI/CaManagement.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/ca-man… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/ca-management/src/YaPI/CaManagement.pm (original) +++ branches/SuSE-SLE-10-SP2-Branch/ca-management/src/YaPI/CaManagement.pm Fri Nov 9 14:01:15 2007 @@ -6693,7 +6693,7 @@ * caKey (required - path to private key in PEM format) -* caPasswd (required, if the private key is unencrypted) +* caPasswd (required; password of the private key or a new password if the key is unencrypted) The return value is "undef" on an error and "1" on success. @@ -6702,7 +6702,8 @@ my $data = { caName => 'My_CA', caCertificate => /path/to/cacert.pem, - caKey => /path/to/cacert.key + caKey => /path/to/cacert.key, + caPasswd => "secret" }; my $res = YaPI::CaManagement->ImportCA($data); @@ -6750,23 +6751,24 @@ code => "FILE_DOES_NOT_EXIST"); } + if (!exists $data->{caPasswd} || !defined $data->{"caPasswd"} ) { + return $self->SetError( summary => __("Missing value 'caPasswd'."), + code => "CHECK_PARAM_FAILED"); + } + eval { my $cert = LIMAL::CaMgm::LocalManagement::readFile($data->{caCertificate}); my $key = LIMAL::CaMgm::LocalManagement::readFile($data->{caKey}); - if(!exists $data->{caPasswd} || !defined $data->{caPasswd}) { - $data->{caPasswd} = ""; - } - - if( defined $data->{'repository'}) { - + if( defined $data->{'repository'}) + { LIMAL::CaMgm::CA::importCA($caName, $cert, $key, $data->{caPasswd}, $data->{"repository"}); - - } else { - + } + else + { LIMAL::CaMgm::CA::importCA($caName, $cert, $key, $data->{caPasswd}); } Modified: branches/SuSE-SLE-10-SP2-Branch/ca-management/src/util.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/ca-man… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/ca-management/src/util.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/ca-management/src/util.ycp Fri Nov 9 14:01:15 2007 @@ -1316,6 +1316,7 @@ ) ) ), + `Password( `id (`passKey), _("&Key Password")), `VSpacing (1), `HBox ( // push button label `PushButton (`id(`ok), `opt(`default, `key_F10), Label::OKButton()), @@ -1362,17 +1363,28 @@ string caCertificate = (string) UI::QueryWidget(`id(`pathCert), `Value); string caKey = (string) UI::QueryWidget(`id(`pathKey), `Value); + string caPasswd = (string) UI::QueryWidget(`id(`passKey), `Value); string caName = (string) UI::QueryWidget(`id(`caName), `Value); if (size (caCertificate) == 0) { + // Error popup Popup::Error(_("Path to certificate file required.")); ret = `again; } else if (size (caKey) == 0) { + // Error popup Popup::Error(_("Path of the private key required.")); ret = `again; - } else if (size (caName) == 0) + } + else if (size (caPasswd) == 0) { + // Error popup + Popup::Error(_("Key Password is required. \nIt must be the password for the encrypted key or a new one in case of a not encrypted key.")); + ret = `again; + } + else if (size (caName) == 0) + { + // Error popup Popup::Error(_("CA name required.")); ret = `again; } @@ -1383,37 +1395,26 @@ UI::OpenDialog(`VBox(`Label(_("Importing request...")))); boolean yapiret = (boolean) YaPI::CaManagement::ImportCA ($["caName" : caName, - "caCertificate" : caCertificate, - "caKey" : caKey]); - y2milestone ("ImportRequest(%1,%2,%3) return %4", + "caCertificate" : caCertificate, + "caKey" : caKey, + "caPasswd" : caPasswd + ]); + y2milestone ("ImportRequest(%1,%2,%3, <passwd>) return %4", caName, caCertificate, caKey, yapiret); - if (!yapiret) - { - // Checking if password required only - map<string,any> messageMap = YaPI::Error(); - if (messageMap["code"]:"" == "PASSWD_REQUIRED") - { - yapiret = (boolean) YaPI::CaManagement::ImportCA ($["caName" : caName, - "caCertificate" : caCertificate, - "caKey" : caKey, - "caPasswd" : getPassword(caName) - ]); - - } - } if (yapiret == nil) { - showErrorCaManagement (); - ret = `again; + showErrorCaManagement (); + ret = `again; } else { - Popup::Message(_("Request has been imported.")); - success = true; - } + // Error popup + Popup::Message(_("CA has been imported.")); + success = true; + } UI::CloseDialog (); } } -- 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] r41919 - in /trunk/installation: VERSION package/yast2-installation.changes src/clients/inst_system_analysis.ycp
by locilka＠svn.opensuse.org 09 Nov '07

09 Nov '07

Author: locilka Date: Fri Nov 9 13:41:54 2007 New Revision: 41919 URL: http://svn.opensuse.org/viewcvs/yast?rev=41919&view=rev Log: - Boot Installed System option has been removed (#327505). - Installation Mode dialog has been redesigned using self-descriptive icons for all options. - Return value from inst_repair is evaluated, error is reported in case of failure. - 2.16.3 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_system_analysis.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=41919&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Fri Nov 9 13:41:54 2007 @@ -1 +1 @@ -2.16.2 +2.16.3 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 Fri Nov 9 13:41:54 2007 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Fri Nov 9 13:30:34 CET 2007 - locilka(a)suse.cz + +- Boot Installed System option has been removed (#327505). +- Installation Mode dialog has been redesigned using + self-descriptive icons for all options. +- Return value from inst_repair is evaluated, error is reported in + case of failure. +- 2.16.3 + +------------------------------------------------------------------- Fri Nov 2 16:31:06 CET 2007 - locilka(a)suse.cz - Adjusted RPM dependencies (Internet module has been moved from Modified: trunk/installation/src/clients/inst_system_analysis.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_sy… ============================================================================== --- trunk/installation/src/clients/inst_system_analysis.ycp (original) +++ trunk/installation/src/clients/inst_system_analysis.ycp Fri Nov 9 13:41:54 2007 @@ -214,8 +214,6 @@ return `finish; } -symbol current_expert_mode = `repair; - string InstModeDialogHelp () { // help text for installation method return _("<big>Installation Mode</big> @@ -248,43 +246,52 @@ ") + // help text for installation method - _("Select Other Options then -select Repair Installed System if you have a damaged Linux system on + _("Select Repair Installed System if you have a damaged Linux system on your hard disk. This option can try to fix problems automatically. -") + - - - - // help text for installation method - _("Select Other Options then -select Boot Installed System if you have a Linux system on your hard -disk that will not boot. With this option, try to fix problems manually. "); } -// see bugzilla #156529 -term InstModeDialogContent (symbol pre_selected) { - term other_options_layout_fix = `Empty(); - term other_options = `Empty(); +map display_info = UI::GetDisplayInfo(); +boolean in_textmode = display_info["TextMode"]:false; - if (pre_selected == `expert) { - other_options_layout_fix = `VSpacing(2.1); - other_options = `RadioButtonGroup ( - `id (`expert_options), - `HBox ( - `HSpacing (6), - `VBox ( - `Left (`RadioButton (`id (`repair), `opt (`notify), - // radio button - _("Re&pair Installed System"), (current_expert_mode == `repair))), - `Left (`RadioButton (`id (`boot), `opt (`notify), - // radio button - _("Boot Installed &System"), (current_expert_mode == `boot))) - ) +/** + * Function creates term containing radio button and icon + * based on current display (graphical/textual) + * + * @param string radio button label + * @param symbol radio button id + * @param string path to an image + * @boolean whether selected (more than one buttons selected don't make sense!) + */ + term CreateRadioButtonTerm (string button_label, symbol button_id, string icon_file, boolean selected) { + return `HBox ( + (in_textmode ? + `Empty() + : + `HWeight ( + 1, + (icon_file == "" ? `Empty() : `Image (icon_file, "")) ) - ); - } + ), + (in_textmode ? + `Empty() + : + `HSpacing (4) + ), + `HWeight( + 5, + `Left (`RadioButton ( + `id (button_id), + `opt(`notify), + button_label, + selected + )) + ) + ); +} +// see bugzilla #156529 +term InstModeDialogContent (symbol pre_selected) { return `VBox ( `VWeight (60, `HVCenter ( `MarginBox ( @@ -293,7 +300,6 @@ `topMargin (0.5), `bottomMargin (0.5), `VBox ( - other_options_layout_fix, `Frame ( // frame _("Select Mode"), @@ -301,20 +307,35 @@ // Basis RadioButtonGroup `RadioButtonGroup ( `id (`inst_mode), - `VBox ( - // radio button - `Left (`RadioButton (`id (`install), `opt(`notify), _("New &Installation"), - ! Mode::update ())), - `VSpacing( 0.3 ), - // radio button - `Left (`RadioButton (`id (`update), `opt(`notify), _("&Update"), - Mode::update ())), - `VSpacing( 1.3 ), - `Left (`RadioButton (`id (`expert), `opt(`notify), _("&Other Options"))) + `MarginBox ( + 2, 1.3, + `VBox ( + // radio button + CreateRadioButtonTerm ( + _("New &Installation"), + `install, + "/usr/share/icons/hicolor/32x32/apps/yast-dirinstall.png", + !Mode::update () + ), + `VSpacing( 0.3 ), + // radio button + CreateRadioButtonTerm ( + _("&Update"), + `update, + "/usr/share/icons/hicolor/32x32/apps/yast-update.png", + Mode::update () + ), + `VSpacing( 1.8 ), + // radio button + CreateRadioButtonTerm ( + _("Re&pair Installed System"), + `repair, + "/usr/share/icons/hicolor/32x32/apps/yast.png", + false + ) + ) ) - ), - // Other RadioButtonGroup - other_options + ) ) ), `VSpacing (2), @@ -495,7 +516,7 @@ // only installation (and addon products) enabled if (other_options_disabled) { UI::ChangeWidget (`id (`update), `Enabled, false); - UI::ChangeWidget (`id (`expert), `Enabled, false); + UI::ChangeWidget (`id (`repair), `Enabled, false); } // --> Handling User Input in Installation Mode @@ -524,37 +545,16 @@ ret = nil; continue; } - // Other Options - Boot - else if (ret == `boot) { - current_expert_mode = `boot; - - ret = nil; - continue; - // Other Options - Repair - } else if (ret == `repair) { - current_expert_mode = `repair; - - ret = nil; - continue; - } // Adjusting current UI - Other Options - else if (ret == `expert) { + else if (ret == `repair) { // Remembering add-on state, switching off and disabling Installation::add_on_selected = (boolean) UI::QueryWidget (`id (`add_on), `Value); - // Show other options - Wizard::SetContents ( - // dialog caption - _("Installation Mode"), InstModeDialogContent(`expert), InstModeDialogHelp(), true, true - ); - UI::ChangeWidget (`id(`add_on), `Value, false); UI::ChangeWidget (`id(`add_on), `Enabled, false); UI::ChangeWidget (`id(`productsources), `Value, false); UI::ChangeWidget (`id(`productsources), `Enabled, false); - UI::ChangeWidget (`id(`inst_mode), `CurrentButton, `expert); - ret = nil; continue; } @@ -563,12 +563,6 @@ else if (contains([`install, `update], ret)) { symbol selected_mode = (symbol) UI::QueryWidget (`id (`inst_mode), `CurrentButton); - // Hide other options - Wizard::SetContents ( - // dialog caption - _("Installation Mode"), InstModeDialogContent(`install), InstModeDialogHelp(), true, true - ); - // Enabling add-on, adjusting previous state (selected) UI::ChangeWidget (`id(`add_on), `Enabled, true); UI::ChangeWidget (`id(`add_on), `Value, Installation::add_on_selected); @@ -590,30 +584,6 @@ ret = nil; continue; } - - // Repair or Boot - if (new_mode == `expert) { - if (! contains([`boot, `repair], current_expert_mode)) { - y2error("Internal error: Widget `expert_mode selected item: %1", current_expert_mode); - ret = nil; - continue; - } - new_mode = current_expert_mode; - - // Boot was selected - if (new_mode == `boot) { - symbol hb_ret = handle_boot(); - y2milestone ("handle_boot() returned '%1'", ret); - - if (hb_ret != `finish) { - y2milestone("Not booting any OS"); - ret = nil; - continue; - } else { - y2milestone ("Booting..."); - } - } - } } else if (ret == `abort) { @@ -627,8 +597,8 @@ // <-- Handling User Input in Installation Mode y2milestone("Selected mode: %1, Return: %2", new_mode, ret); -if (ret == `next) -{ + +if (ret == `next) { if (new_mode == `install) { Mode::SetMode ("installation"); @@ -644,12 +614,6 @@ Mode::SetMode ("repair"); } - if (new_mode == `boot) - { - Mode::SetMode (""); - ret = `finish; - } - if (new_mode == `install || new_mode == `update) { Installation::add_on_selected = (boolean) UI::QueryWidget (`id (`add_on), `Value); @@ -674,9 +638,8 @@ y2milestone ("Disabled: %1", ProductControl::DisabledModules); } -} -if (ret == `back || ret == `finish) { +} else if (ret == `back || ret == `finish) { y2milestone("Returning: %1", ret); return ret; } @@ -684,7 +647,28 @@ if (Mode::repair ()) { y2milestone("Calling inst_repair"); - WFM::CallFunction ("inst_repair"); + any ret = WFM::CallFunction ("inst_repair"); + + if (ret == nil) { + Report::Error ( + // TRANSLATORS: an error message (the same is in base.pot) + // this should not happen, but life is cruel... + // %1 - (failed) module name + // %2 - logfile, possibly with errors + // %3 - link to our bugzilla + // %4 - directory where YaST logs are stored + sformat (_("Calling the YaST module %1 has failed. +More information can be found near the end of the '%2' file. + +This is worth reporting a bug at %3. +Please, attach also all YaST logs stored in the '%4' directory."), + "inst_repair", + "/var/log/YaST2/y2log", + "http://bugzilla.novell.com/", + "/var/log/YaST2/") + ); + } + return `finish; } @@ -719,8 +703,7 @@ } Packages::InitializeAddOnProducts (); -if (Mode::mode () != start_mode) -{ +if (Mode::mode () != start_mode) { y2milestone ("Switching Steps from %1 to %2 ", start_mode, Mode::mode ()); UpdateWizardSteps (); y2milestone ("Resetting disk target to read values"); @@ -732,24 +715,16 @@ Pkg::PkgReset (); Packages::Init( true ); - if (! Mode::repair ()) - { - ret = ProductControl::RunFrom ( - ProductControl::CurrentStep () + 1, - false); - if (ret == `next) - ret = `finish; - } -} -else if (! Mode::repair()) -{ - UpdateWizardSteps (); - ret = ProductControl::RunFrom ( - ProductControl::CurrentStep () + 1, - false); + ret = ProductControl::RunFrom (ProductControl::CurrentStep () + 1, false); + if (ret == `next) ret = `finish; +} else { + UpdateWizardSteps (); + ret = ProductControl::RunFrom (ProductControl::CurrentStep () + 1, false); + if (ret == `next) + ret = `finish; } return ret; -- 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] r41918 - in /trunk/core: VERSION libycp/src/pathsearch.cc package/yast2-core.changes wfm/src/Y2CCWFM.cc
by mvidner＠svn.opensuse.org 09 Nov '07

09 Nov '07

Author: mvidner Date: Fri Nov 9 13:36:39 2007 New Revision: 41918 URL: http://svn.opensuse.org/viewcvs/yast?rev=41918&view=rev Log: Do not look for YCP scripts under the current working directory, unless explicitly requested (#330965). Modified: trunk/core/VERSION trunk/core/libycp/src/pathsearch.cc trunk/core/package/yast2-core.changes trunk/core/wfm/src/Y2CCWFM.cc Modified: trunk/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/VERSION?rev=41918&r1=41917&… ============================================================================== --- trunk/core/VERSION (original) +++ trunk/core/VERSION Fri Nov 9 13:36:39 2007 @@ -1 +1 @@ -2.16.1 +2.16.2 Modified: trunk/core/libycp/src/pathsearch.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/pathsearch.cc?re… ============================================================================== --- trunk/core/libycp/src/pathsearch.cc (original) +++ trunk/core/libycp/src/pathsearch.cc Fri Nov 9 13:36:39 2007 @@ -71,16 +71,25 @@ for (int i = 0; i < NUM_LEVELS; i++) { - if (home - && strcmp (paths[i], "HOME") == 0) + // #330965, avoid publicly writable dirs in search path + // (we return a nonexistent dir because the API does not + // allow us to say Skip, and a cleanup patch to fix that + // would be too large) + static const char * not_there = YAST2DIR "/not-there"; + if (strcmp (paths[i], "HOME") == 0) { + if (home) my_paths[i] = string (home) + "/.yast2"; + else + my_paths[i] = string (not_there); } - else if (y2dir - && (strcmp (paths[i], "Y2DIR") == 0) - && (strcmp (YAST2DIR, y2dir) != 0)) // prevent path duplication + else if (strcmp (paths[i], "Y2DIR") == 0) { + if (y2dir + && (strcmp (YAST2DIR, y2dir) != 0)) // prevent path duplication my_paths[i] = string (y2dir); + else + my_paths[i] = string (not_there); } else { Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Fri Nov 9 13:36:39 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Nov 2 14:03:37 CET 2007 - mvidner(a)suse.cz + +- Do not look for YCP scripts under the current working + directory, unless explicitly requested (#330965). +- 2.16.2 + +------------------------------------------------------------------- Thu Oct 4 15:03:52 CEST 2007 - mvidner(a)suse.cz - Distinguish "foo.ycp contains an error" from "foo.ycp not found" Modified: trunk/core/wfm/src/Y2CCWFM.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/wfm/src/Y2CCWFM.cc?rev=4191… ============================================================================== --- trunk/core/wfm/src/Y2CCWFM.cc (original) +++ trunk/core/wfm/src/Y2CCWFM.cc Fri Nov 9 13:36:39 2007 @@ -89,7 +89,11 @@ { // not found "clients/<name>.ycp" // try plain name + // only if the name contains a slash, #330965#c10 + if (!strchr (name, '/')) + return 0; + // we have to keep completeFilename because it also does :: translation :( fullname = Y2PathSearch::completeFilename (string (name)); if (fullname.empty()) return 0; @@ -98,22 +102,14 @@ if (!file) return 0; // Not found under the direct path either. filename = name; - // 2nd try: examine the file: Is it not executable or does - // the name end in .ycp or does the file begin with #!/bin/y2wfm + // 2nd try: examine the file: does the name end in .ycp bool try_it = false; if (strlen(name) > 4 && !strcmp(name + strlen(name) - 4, ".ycp")) try_it = true; - else { - struct stat buf; - if (0 == stat(name, &buf)) - { - // Try it, if it is not executable - if (S_ISREG(buf.st_mode) && buf.st_mode & S_IXOTH != S_IXOTH) - try_it = true; - } - } + // The stat code that used to be here had a bug + // in operator precedence rendering it useless. let's make it explicit. if (!try_it) return 0; modulename = string(name); -- 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] r41917 - in /trunk/yast2: library/packages/src/common.ycp package/yast2.changes
by jsrain＠svn.opensuse.org 09 Nov '07

09 Nov '07

Author: jsrain Date: Fri Nov 9 13:10:24 2007 New Revision: 41917 URL: http://svn.opensuse.org/viewcvs/yast?rev=41917&view=rev Log: changed labels of software confirmation popup to Install/Cancel, resp. Uninstall/Cancel (#215195) Modified: trunk/yast2/library/packages/src/common.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/packages/src/common.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/commo… ============================================================================== --- trunk/yast2/library/packages/src/common.ycp (original) +++ trunk/yast2/library/packages/src/common.ycp Fri Nov 9 13:10:24 2007 @@ -145,7 +145,10 @@ boolean doit = (Mode::commandline()) ? (CommandLine::Interactive() ? AskPackages(packs, install) : true ) : Popup::AnyQuestionRichText( "", text, 40, 10, - Label::ContinueButton (), Label::CancelButton (), +// labels changed for bug #215195 +// Label::ContinueButton (), Label::CancelButton (), +// push button label + install ? Label::InstallButton () : _("&Uninstall"), Label::CancelButton (), `focus_yes ); Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri Nov 9 13:10:24 2007 @@ -4,6 +4,8 @@ - added manpage for yast (#336004) - initialize product name during live installation properly (#297609) +- changed labels of software confirmation popup to Install/Cancel, + resp. Uninstall/Cancel (#215195) ------------------------------------------------------------------- Wed Nov 7 20:59:53 CET 2007 - mzugec(a)suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0