November 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r62763 - in /branches/SuSE-Code-11-SP1-Branch/network: VERSION package/yast2-network.changes src/clients/save_network.ycp src/modules/LanUdevAuto.ycp
by mzugec＠svn2.opensuse.org 08 Nov '10

08 Nov '10

Author: mzugec Date: Mon Nov 8 16:41:40 2010 New Revision: 62763 URL: http://svn.opensuse.org/viewcvs/yast?rev=62763&view=rev Log: TP-L3: if possible, for temporary installation network use same device with same MAC address, even if devicename changed (bnc#648270) Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP1-Branch/network/src/clients/save_network.ycp branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanUdevAuto.ycp Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/network/VERSION Mon Nov 8 16:41:40 2010 @@ -1 +1 @@ -2.17.143 +2.17.144 Modified: branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes Mon Nov 8 16:41:40 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Nov 8 16:40:34 CET 2010 - mzugec(a)suse.de + +- TP-L3: if possible, for temporary installation network use same +device with same MAC address, even if devicename changed (bnc#648270) +- 2.17.144 + +------------------------------------------------------------------- Wed Oct 27 13:28:04 CEST 2010 - mzugec(a)suse.cz - AY: when no network profile, don't change network configuration Modified: branches/SuSE-Code-11-SP1-Branch/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/clients/save_network.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/clients/save_network.ycp Mon Nov 8 16:41:40 2010 @@ -64,6 +64,7 @@ * @return true on success */ define boolean ReadInstallInf() { + y2milestone("ReadInstallInf()"); /* Detect install.inf location */ path install_inf = nil; @@ -117,10 +118,14 @@ /* Split network device */ netdevice = InstallInf["netdevice"]:""; + y2milestone("InstallInf::netdevice:%1", netdevice); if (Mode::autoinst()){ + // if possible, for temporary installation network use same device + // with same MAC address (even if devicename changed) (bnc#648270) string new_devname = LanUdevAuto::GetDevnameByMAC(InstallInf["hwaddr"]:""); + y2milestone("LanUdevAuto::netdevice:%1", new_devname); if (size(new_devname)>0){ - y2internal("old devname: %1, new devname: %2", netdevice, new_devname); + y2milestone("old devname: %1, new devname: %2", netdevice, new_devname); netdevice=new_devname; } } Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanUdevAuto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanUdevAuto.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanUdevAuto.ycp Mon Nov 8 16:41:40 2010 @@ -229,22 +229,16 @@ global string GetDevnameByMAC(string mac){ string devname=""; if (size(mac)>0){ - foreach(integer id, map<string, any> row, (map<integer, map <string, any> >)LanItems::Items, { - LanItems::current=id; - string name = LanItems::GetItemUdev("NAME"); - string mac_rule = LanItems::GetItemUdev("ATTR{address}"); - if (size(mac_rule)==0){ - y2error("No MAC rule %1", row); - continue; - } else - y2internal("MAC rule %1", row); - if (mac_rule==mac){ - devname=name; - y2internal("Rule matched! New devname %1", devname); - break; - } + y2milestone("MAC address from 1st stage: %1", mac); + foreach(map rule, udev_rules, { + if (rule["rule"]:""=="ATTR{address}"){ + if (mac==rule["value"]:""){ + devname=rule["name"]:""; + y2milestone("MAC address matched with device:%1", rule["name"]:""); + break; + } + } }); - } else y2warning("No MAC address to compare."); return devname; } -- 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] r62762 - /tags/stable-2_20_2/network/
by mzugec＠svn2.opensuse.org 08 Nov '10

08 Nov '10

Author: mzugec Date: Mon Nov 8 15:49:51 2010 New Revision: 62762 URL: http://svn.opensuse.org/viewcvs/yast?rev=62762&view=rev Log: Created tag stable-2_20_2 for network Added: tags/stable-2_20_2/network/ - copied from r62761, trunk/network/ -- 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] r62761 - in /trunk/network: VERSION package/yast2-network.changes src/clients/save_network.ycp src/modules/LanUdevAuto.ycp
by mzugec＠svn2.opensuse.org 08 Nov '10

08 Nov '10

Author: mzugec Date: Mon Nov 8 15:49:43 2010 New Revision: 62761 URL: http://svn.opensuse.org/viewcvs/yast?rev=62761&view=rev Log: - TP-L3: if possible, for temporary installation network use same device with same MAC address, even if devicename changed (bnc#648270) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/save_network.ycp trunk/network/src/modules/LanUdevAuto.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=62761&r1=627… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon Nov 8 15:49:43 2010 @@ -1 +1 @@ -2.20.1 +2.20.2 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 Mon Nov 8 15:49:43 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Nov 8 15:28:20 CET 2010 - mzugec(a)suse.cz + +- TP-L3: if possible, for temporary installation network use same +device with same MAC address, even if devicename changed (bnc#648270) +- 2.20.2 + +------------------------------------------------------------------- Wed Nov 3 17:03:37 CET 2010 - mzugec(a)suse.cz - support for ordering in bonding slaves (bnc#640611) 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 Mon Nov 8 15:49:43 2010 @@ -64,6 +64,7 @@ * @return true on success */ define boolean ReadInstallInf() { + y2milestone("ReadInstallInf()"); /* Detect install.inf location */ path install_inf = nil; @@ -117,10 +118,14 @@ /* Split network device */ netdevice = InstallInf["netdevice"]:""; + y2milestone("InstallInf::netdevice:%1", netdevice); if (Mode::autoinst()){ + // if possible, for temporary installation network use same device + // with same MAC address (even if devicename changed) (bnc#648270) string new_devname = LanUdevAuto::GetDevnameByMAC(InstallInf["hwaddr"]:""); + y2milestone("LanUdevAuto::netdevice:%1", new_devname); if (size(new_devname)>0){ - y2internal("old devname: %1, new devname: %2", netdevice, new_devname); + y2milestone("old devname: %1, new devname: %2", netdevice, new_devname); netdevice=new_devname; } } Modified: trunk/network/src/modules/LanUdevAuto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanUdevAuto.… ============================================================================== --- trunk/network/src/modules/LanUdevAuto.ycp (original) +++ trunk/network/src/modules/LanUdevAuto.ycp Mon Nov 8 15:49:43 2010 @@ -229,22 +229,16 @@ global string GetDevnameByMAC(string mac){ string devname=""; if (size(mac)>0){ - foreach(integer id, map<string, any> row, (map<integer, map <string, any> >)LanItems::Items, { - LanItems::current=id; - string name = LanItems::GetItemUdev("NAME"); - string mac_rule = LanItems::GetItemUdev("ATTR{address}"); - if (size(mac_rule)==0){ - y2error("No MAC rule %1", row); - continue; - } else - y2milestone("MAC rule %1", row); - if (mac_rule==mac){ - devname=name; - y2milestone("Rule matched! New devname %1", devname); - break; - } + y2milestone("MAC address from 1st stage: %1", mac); + foreach(map rule, udev_rules, { + if (rule["rule"]:""=="ATTR{address}"){ + if (mac==rule["value"]:""){ + devname=rule["name"]:""; + y2milestone("MAC address matched with device:%1", rule["name"]:""); + break; + } + } }); - } else y2warning("No MAC address to compare."); return devname; } -- 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] r62760 - in /branches/SuSE-SLE-10-SP4-Branch/packager: VERSION package/yast2-packager.changes src/clients/inst_kickoff.ycp
by jsrain＠svn2.opensuse.org 08 Nov '10

08 Nov '10

Author: jsrain Date: Mon Nov 8 13:50:20 2010 New Revision: 62760 URL: http://svn.opensuse.org/viewcvs/yast?rev=62760&view=rev Log: add HyperV drivers to initrd (bnc#651348) Modified: branches/SuSE-SLE-10-SP4-Branch/packager/VERSION branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/VERSION Mon Nov 8 13:50:20 2010 @@ -1 +1 @@ -2.13.187 +2.13.188 Modified: branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes Mon Nov 8 13:50:20 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Nov 8 13:35:25 CET 2010 - jsrain(a)suse.cz + +- add HyperV drivers to initrd (bnc#651348) +- 2.13.188 + +------------------------------------------------------------------- Wed Nov 3 20:22:47 UTC 2010 - lslezak(a)suse.cz - don't reset package selection in the installation proposal when Modified: branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp Mon Nov 8 13:50:20 2010 @@ -56,6 +56,30 @@ } } +void HyperVPVToInitrd() { + // can the kernel modules be loaded? + if (0 == (integer)SCR::Execute(.target.bash, "/sbin/modprobe vmbus")) + { + // add modules to initrd + Initrd::AddModule ("blkvsc", ""); + Initrd::AddModule ("netvsc", ""); + Initrd::AddModule ("storvsc", ""); + Initrd::AddModule ("vmbus", ""); + + y2milestone("Added HyperV PV drivers to initrd, configured drivers: %1", Initrd::ListModules()); + + // it also need to be added to MODULES_LOADED_ON_BOOT - not needed on SLES10 +// Kernel::AddModuleToLoad ("hv_storvsc"); +// Kernel::AddModuleToLoad ("hv_netvsc"); +// y2milestone ("Added hv_storvsc and hv_netvsc to modules loaded on boot"); + + } + else + { + y2milestone("Cannot load vmbus kernel module, skipping HyperV PV driver installation"); + } +} + /** * Write a fake mtab to the target system since some %post scripts might @@ -414,8 +438,9 @@ AcpiToInitrd (); } - // add Xen PV drivers to initrd + // add Xen and HyperV PV drivers to initrd XenPVToInitrd(); + HyperVPVToInitrd(); if (Stage::initial ()) { -- 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] r62759 - /branches/tmp/jsrain/unattended-migration/storage/storage/src/modules/Storage.ycp
by jsrain＠svn2.opensuse.org 08 Nov '10

08 Nov '10

Author: jsrain Date: Mon Nov 8 10:57:41 2010 New Revision: 62759 URL: http://svn.opensuse.org/viewcvs/yast?rev=62759&view=rev Log: update fstab options (bnc#649497) Modified: branches/tmp/jsrain/unattended-migration/storage/storage/src/modules/Storage.ycp Modified: branches/tmp/jsrain/unattended-migration/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/storage/storage/src/modules/Storage.ycp (original) +++ branches/tmp/jsrain/unattended-migration/storage/storage/src/modules/Storage.ycp Mon Nov 8 10:57:41 2010 @@ -5178,6 +5178,25 @@ } } +global define void UpdateFstabOptions() { + y2milestone( "UpdateFstabOptions" ); + string tabpath = PathToDestdir( "/etc/fstab" ); + map fstab = Partitions::GetFstab( tabpath ); + integer line = 0; + string n = ""; + while( line<=AsciiFile::NumLines( fstab ) ) + { + map l = AsciiFile::GetLine( fstab, line ); + string options = l["fields", 3]:""; + if (regexpmatch (options, "^$.*,$\?hotplug$,.*$\?$")) { + options = regexpsub (options, "^$.*,$\?hotplug$,.*$\?$", "\\1nofail\\2"); + AsciiFile::ChangeLineField( fstab, line, 3, options ); + } + line = line+1; + } + AsciiFile::RewriteFile( fstab, tabpath ); +} + global string HdToIseries( string input ) ``{ string ret = input; @@ -5564,6 +5583,10 @@ UpdateFstabPersistentNames(); } + + // FIXME: proper fix + UpdateFstabOptions(); + // remove EVMS // FIXME add appropriate condition if needed (does not seem so) UpdateFstabEvms2Lvm(); -- 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] r62758 - /tags/stable-2_21_81/gtk/
by rpmcruz＠svn2.opensuse.org 06 Nov '10

06 Nov '10

Author: rpmcruz Date: Sat Nov 6 01:31:57 2010 New Revision: 62758 URL: http://svn.opensuse.org/viewcvs/yast?rev=62758&view=rev Log: Created tag stable-2_21_81 for gtk Added: tags/stable-2_21_81/gtk/ - copied from r62757, trunk/gtk/ -- 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] r62757 - /tags/stable-2_21_81/
by rpmcruz＠svn2.opensuse.org 06 Nov '10

06 Nov '10

Author: rpmcruz Date: Sat Nov 6 01:31:50 2010 New Revision: 62757 URL: http://svn.opensuse.org/viewcvs/yast?rev=62757&view=rev Log: Created tag stable-2_21_81 Added: tags/stable-2_21_81/ -- 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] r62756 - in /trunk/gtk: VERSION VERSION.cmake package/yast2-gtk.changes
by rpmcruz＠svn2.opensuse.org 06 Nov '10

06 Nov '10

Author: rpmcruz Date: Sat Nov 6 01:31:43 2010 New Revision: 62756 URL: http://svn.opensuse.org/viewcvs/yast?rev=62756&view=rev Log: Milestone version. Modified: trunk/gtk/VERSION trunk/gtk/VERSION.cmake trunk/gtk/package/yast2-gtk.changes Modified: trunk/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION?rev=62756&r1=62755&r… ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Sat Nov 6 01:31:43 2010 @@ -1 +1 @@ -2.21.80 +2.21.81 Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=62756&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Sat Nov 6 01:31:43 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "80") +SET(VERSION_PATCH "81") Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Sat Nov 6 01:31:43 2010 @@ -1,6 +1,12 @@ ------------------------------------------------------------------- Mon Nov 01 16:49:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt +- 2.21.81 +- fix build for 11.2 (added cmake requirement version). + +------------------------------------------------------------------- +Mon Nov 01 16:49:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + - 2.21.80 - fix: show the software manager header bar. -- 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] r62755 - /tags/stable-2_20_3/yast2/
by lslezak＠svn2.opensuse.org 05 Nov '10

05 Nov '10

Author: lslezak Date: Fri Nov 5 14:01:35 2010 New Revision: 62755 URL: http://svn.opensuse.org/viewcvs/yast?rev=62755&view=rev Log: Created tag stable-2_20_3 for yast2 Added: tags/stable-2_20_3/yast2/ (props changed) - copied from r62754, 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] r62754 - in /trunk/yast2: VERSION library/packages/src/PackageCallbacks.ycp package/yast2.changes
by lslezak＠svn2.opensuse.org 05 Nov '10

05 Nov '10

Author: lslezak Date: Fri Nov 5 14:00:44 2010 New Revision: 62754 URL: http://svn.opensuse.org/viewcvs/yast?rev=62754&view=rev Log: - PackageCallbacks: removed the retry/abort/skip dialog from DoneProvide callback - the user is asked via MediaChange callback, don't ask twice when aborting. - 2.20.3 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=62754&r1=62753… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Fri Nov 5 14:00:44 2010 @@ -1 +1 @@ -2.20.2 +2.20.3 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 Fri Nov 5 14:00:44 2010 @@ -318,141 +318,9 @@ CommandLine::PrintVerboseNoCR(clear_string); } - if (provide_aborted) - { - provide_aborted = false; - return "C"; - } - if (error != 0) { - // this is for error code 1 ("NOT_FOUND"), %1 is name of a package - string message = sformat (_("Package %1 was not found on the medium."), name); - - // "IO" - if (error == 2) - { - // error message, %1 is a package name - message = sformat(_("Package %1 could not be downloaded (input/output error)."), name); - } - // "INVALID" - else if (error == 3) - { - // error message, %1 is a package name - 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 "C"; } 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 Fri Nov 5 14:00:44 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Nov 5 12:40:03 UTC 2010 - lslezak(a)suse.cz + +- PackageCallbacks: removed the retry/abort/skip dialog from + DoneProvide callback - the user is asked via MediaChange + callback, don't ask twice when aborting. +- 2.20.3 + +------------------------------------------------------------------- Tue Nov 2 15:09:00 UTC 2010 - lslezak(a)suse.cz - updated to match the changed StartPackage callback signature -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0