January 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r63065 - /tags/stable-2_20_8/yast2/
by lslezak＠svn2.opensuse.org 03 Jan '11

03 Jan '11

Author: lslezak Date: Mon Jan 3 17:55:00 2011 New Revision: 63065 URL: http://svn.opensuse.org/viewcvs/yast?rev=63065&view=rev Log: Created tag stable-2_20_8 for yast2 Added: tags/stable-2_20_8/yast2/ (props changed) - copied from r63064, trunk/yast2/ -- 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] r63064 - in /trunk/yast2: VERSION library/packages/src/PackageCallbacks.ycp package/yast2.changes
by lslezak＠svn2.opensuse.org 03 Jan '11

03 Jan '11

Author: lslezak Date: Mon Jan 3 17:53:29 2011 New Revision: 63064 URL: http://svn.opensuse.org/viewcvs/yast?rev=63064&view=rev Log: - don't abort when package checksum verification failes, ask to download the file again (bnc#657608) - 2.20.8 (partially reverted commit Modified: trunk/yast2/VERSION trunk/yast2/library/packages/src/PackageCallbacks.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=63064&r1=63063… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Mon Jan 3 17:53:29 2011 @@ -1 +1 @@ -2.20.7 +2.20.8 Modified: trunk/yast2/library/packages/src/PackageCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/Packa… ============================================================================== --- trunk/yast2/library/packages/src/PackageCallbacks.ycp (original) +++ trunk/yast2/library/packages/src/PackageCallbacks.ycp Mon Jan 3 17:53:29 2011 @@ -305,7 +305,8 @@ */ global string DoneProvide (integer error, string reason, string name) { - y2milestone("DoneProvide: %1", error); + y2milestone("DoneProvide: %1, %2, %3", error, reason, name); + if (_provide_popup) { UI::CloseDialog(); @@ -318,11 +319,131 @@ CommandLine::PrintVerboseNoCR(clear_string); } - if (error != 0) + if (provide_aborted) { + provide_aborted = false; return "C"; } + // INVALID + if (error == 3) + { + // error message, %1 is a package name + string message = sformat(_("Package %1 is broken, integrity check has failed."), name); + + + if (Mode::commandline()) { + CommandLine::Print(message); + + // ask user in the interactive mode + if (CommandLine::Interactive()) + { + CommandLine::Print(""); + + // command line mode - ask user whether installation of the failed package should be retried + CommandLine::Print(_("Retry installation of the package?")); + + if (CommandLine::YesNo()) + { + // return Retry + return "R"; + } + + // command line mode - ask user whether the installation should be aborted + CommandLine::Print(_("Abort the installation?")); + if (CommandLine::YesNo()) + { + // return Abort + return "C"; + } + + // otherwise return Ignore (default) + return "I"; + } + + return "I"; + } + + term button_box = `ButtonBox ( + `PushButton (`id(`abort), `opt (`cancelButton, `key_F9), Label::AbortButton()), + `PushButton (`id(`retry), `opt (`customButton), Label::RetryButton()), + `PushButton (`id(`ignore), `opt (`okButton), Label::SkipButton()) + ); + + if ( showLongInfo ) + { + UI::OpenDialog( `opt(`decorated), LayoutPopup (message, button_box, 10, true) ); + UI::ReplaceWidget(`id(`info), `RichText (`opt(`plainText), sformat (_("Error: %1:"), error) + reason) ); + } + else + { + UI::OpenDialog( `opt(`decorated), LayoutPopup (message, button_box, vsize_no_details, false) ); + UI::ReplaceWidget(`id(`info), `Empty() ); + } + + any r = nil; + + repeat + { + r = UI::UserInput(); + if ( r == `show ) + { + showLongInfo = ShowLogInfo (message, button_box); + if (showLongInfo) + { + string error_symbol = "ERROR"; + + if (error == 1) + { + error_symbol = "NOT_FOUND"; + } + else if (error == 2) + { + error_symbol = "IO"; + } + else if (error == 3) + { + error_symbol = "INVALID"; + } + + UI::ReplaceWidget(`id(`info), + `RichText (`opt(`plainText), + // error message, %1 is code of the error, + // detail string is appended to the end + sformat (_("Error: %1:"), error_symbol) + reason) ); + } + else + { + UI::ReplaceWidget(`id(`info), `Empty() ); + } + } + } until (r == `abort || r == `retry || r == `ignore); + + y2milestone ("DoneProvide %1", r); + + UI::CloseDialog(); + + if (r == `abort) + return "C"; + if (r == `retry) + return "R"; + if (r == `ignore) + { + // don't show the warning when a refresh fails + if (!autorefreshing) + { + // TODO: add "Don't show again" checkbox + // a warning popup displayed after pressing [Ignore] after a download error + Popup::Warning(_("Ignoring a download failure may result in a broken system. +The system should be later verified by running the Software Management module.")); + } + + return "I"; + } + + y2error("Unknown user input: %1", r); + } + return "I"; } 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 Mon Jan 3 17:53:29 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jan 3 16:49:18 UTC 2011 - lslezak(a)suse.cz + +- don't abort when package checksum verification failes, ask to + download the file again (bnc#657608) +- 2.20.8 + +------------------------------------------------------------------- Wed Dec 22 18:58:19 CET 2010 - mzugec(a)suse.cz - ifcfg-ethX.Y style config files for VLAN(fate#309240) -- 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] r63063 - /tags/branch-Code-11-SP1-2_17_18/wagon/
by locilka＠svn2.opensuse.org 03 Jan '11

03 Jan '11

Author: locilka Date: Mon Jan 3 15:57:58 2011 New Revision: 63063 URL: http://svn.opensuse.org/viewcvs/yast?rev=63063&view=rev Log: Created tag branch-Code-11-SP1-2_17_18 for wagon Added: tags/branch-Code-11-SP1-2_17_18/wagon/ (props changed) - copied from r63062, branches/SuSE-Code-11-SP1-Branch/wagon/ -- 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] r63062 - /tags/stable-2_20_1/wagon/
by locilka＠svn2.opensuse.org 03 Jan '11

03 Jan '11

Author: locilka Date: Mon Jan 3 15:57:31 2011 New Revision: 63062 URL: http://svn.opensuse.org/viewcvs/yast?rev=63062&view=rev Log: Created tag stable-2_20_1 for wagon Added: tags/stable-2_20_1/wagon/ - copied from r63061, trunk/wagon/ -- 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] r63061 - in /trunk/wagon: VERSION package/yast2-wagon.changes
by locilka＠svn2.opensuse.org 03 Jan '11

03 Jan '11

Author: locilka Date: Mon Jan 3 15:56:26 2011 New Revision: 63061 URL: http://svn.opensuse.org/viewcvs/yast?rev=63061&view=rev Log: New version Modified: trunk/wagon/VERSION trunk/wagon/package/yast2-wagon.changes Modified: trunk/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/VERSION?rev=63061&r1=63060… ============================================================================== --- trunk/wagon/VERSION (original) +++ trunk/wagon/VERSION Mon Jan 3 15:56:26 2011 @@ -1 +1 @@ -2.18.1 +2.20.1 Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Mon Jan 3 15:56:26 2011 @@ -2,6 +2,7 @@ Mon Jan 3 15:32:13 CET 2011 - locilka(a)suse.cz - Do not allow to continue without package lock (BNC #616982) +- 2.20.1 ------------------------------------------------------------------- Mon Mar 15 13:28:41 CET 2010 - locilka(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

[yast-commit] r63060 - in /branches/SuSE-Code-11-SP1-Branch/wagon: VERSION package/yast2-wagon.changes
by locilka＠svn2.opensuse.org 03 Jan '11

03 Jan '11

Author: locilka Date: Mon Jan 3 15:56:10 2011 New Revision: 63060 URL: http://svn.opensuse.org/viewcvs/yast?rev=63060&view=rev Log: New version Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/VERSION Mon Jan 3 15:56:10 2011 @@ -1 +1 @@ -2.17.17 +2.17.18 Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Mon Jan 3 15:56:10 2011 @@ -2,6 +2,7 @@ Mon Jan 3 15:32:13 CET 2011 - locilka(a)suse.cz - Do not allow to continue without package lock (BNC #616982) +- 2.17.18 ------------------------------------------------------------------- Mon Mar 15 13:28:41 CET 2010 - locilka(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

[yast-commit] r63059 - in /trunk/wagon: package/yast2-wagon.changes src/clients/wagon.ycp
by locilka＠svn2.opensuse.org 03 Jan '11

03 Jan '11

Author: locilka Date: Mon Jan 3 15:54:37 2011 New Revision: 63059 URL: http://svn.opensuse.org/viewcvs/yast?rev=63059&view=rev Log: Do not allow to continue without package lock (BNC #616982) Modified: trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/clients/wagon.ycp Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Mon Jan 3 15:54:37 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jan 3 15:32:13 CET 2011 - locilka(a)suse.cz + +- Do not allow to continue without package lock (BNC #616982) + +------------------------------------------------------------------- Mon Mar 15 13:28:41 CET 2010 - locilka(a)suse.cz - Restarting YaST before calling registration after packages are Modified: trunk/wagon/src/clients/wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon.ycp?rev=… ============================================================================== --- trunk/wagon/src/clients/wagon.ycp (original) +++ trunk/wagon/src/clients/wagon.ycp Mon Jan 3 15:54:37 2011 @@ -69,7 +69,10 @@ ProductControl::AddWizardSteps ([$["stage":Stage::stage(), "mode":Mode::mode()]]); // Can't acquire packager lock - if (PackageLock::Check() != true) { + // BNC #616982 + map <string,any> pkg_connected = PackageLock::Connect(false); + if (pkg_connected["connected"]:false != true) { + y2warning ("PackageLock not obtained"); return false; } -- 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] r63058 - in /branches/SuSE-Code-11-SP1-Branch/wagon: package/yast2-wagon.changes src/clients/wagon.ycp
by locilka＠svn2.opensuse.org 03 Jan '11

03 Jan '11

Author: locilka Date: Mon Jan 3 15:54:21 2011 New Revision: 63058 URL: http://svn.opensuse.org/viewcvs/yast?rev=63058&view=rev Log: Do not allow to continue without package lock (BNC #616982) Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon.ycp Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Mon Jan 3 15:54:21 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jan 3 15:32:13 CET 2011 - locilka(a)suse.cz + +- Do not allow to continue without package lock (BNC #616982) + +------------------------------------------------------------------- Mon Mar 15 13:28:41 CET 2010 - locilka(a)suse.cz - Restarting YaST before calling registration after packages are Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon.ycp Mon Jan 3 15:54:21 2011 @@ -69,7 +69,10 @@ ProductControl::AddWizardSteps ([$["stage":Stage::stage(), "mode":Mode::mode()]]); // Can't acquire packager lock - if (PackageLock::Check() != true) { + // BNC #616982 + map <string,any> pkg_connected = PackageLock::Connect(false); + if (pkg_connected["connected"]:false != true) { + y2warning ("PackageLock not obtained"); return false; } -- 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] r63057 - /tags/stable-2_20_14/packager/
by lslezak＠svn2.opensuse.org 03 Jan '11

03 Jan '11

Author: lslezak Date: Mon Jan 3 15:20:56 2011 New Revision: 63057 URL: http://svn.opensuse.org/viewcvs/yast?rev=63057&view=rev Log: Created tag stable-2_20_14 for packager Added: tags/stable-2_20_14/packager/ - copied from r63056, trunk/packager/ -- 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] r63056 - /tags/stable-2_20_14/
by lslezak＠svn2.opensuse.org 03 Jan '11

03 Jan '11

Author: lslezak Date: Mon Jan 3 15:20:54 2011 New Revision: 63056 URL: http://svn.opensuse.org/viewcvs/yast?rev=63056&view=rev Log: Created tag stable-2_20_14 Added: tags/stable-2_20_14/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0