February 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55445 - in /branches/SuSE-SLE-10-SP3-Branch/nis-server: VERSION package/yast2-nis-server.changes src/NisServer.ycp
by jsuchome＠svn.opensuse.org 11 Feb '09

11 Feb '09

Author: jsuchome Date: Wed Feb 11 22:15:11 2009 New Revision: 55445 URL: http://svn.opensuse.org/viewcvs/yast?rev=55445&view=rev Log: - check if /var/yp/Makefile exists before reading it (bnc#381369) - 2.13.8 Modified: branches/SuSE-SLE-10-SP3-Branch/nis-server/VERSION branches/SuSE-SLE-10-SP3-Branch/nis-server/package/yast2-nis-server.changes branches/SuSE-SLE-10-SP3-Branch/nis-server/src/NisServer.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/nis-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/nis-se… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/nis-server/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/nis-server/VERSION Wed Feb 11 22:15:11 2009 @@ -1 +1 @@ -2.13.7 +2.13.8 Modified: branches/SuSE-SLE-10-SP3-Branch/nis-server/package/yast2-nis-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/nis-se… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/nis-server/package/yast2-nis-server.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/nis-server/package/yast2-nis-server.changes Wed Feb 11 22:15:11 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jun 6 10:46:42 CEST 2008 - jsuchome(a)suse.cz + +- check if /var/yp/Makefile exists before reading it (bnc#381369) +- 2.13.8 + +------------------------------------------------------------------- Wed Nov 8 09:54:03 CET 2006 - jsuchome(a)suse.cz - fixed autoyast schema (#211014) Modified: branches/SuSE-SLE-10-SP3-Branch/nis-server/src/NisServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/nis-se… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/nis-server/src/NisServer.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/nis-server/src/NisServer.ycp Wed Feb 11 22:15:11 2009 @@ -352,6 +352,8 @@ } define void YPMakefileVars () { + if (!FileUtils::Exists ("/var/yp/Makefile")) return; + maps = (list<string>) SCRGet (.var.yp.makefile.maps, ["passwd", "group", "rpc", "services", "netid"]); minuid = SCRGetInt (.var.yp.makefile.MINUID, 100); mingid = SCRGetInt (.var.yp.makefile.MINGID, 100); -- 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] r55444 - /tags/branch-SLE-10-SP3-2_13_33/ldap-client/
by jsuchome＠svn.opensuse.org 11 Feb '09

11 Feb '09

Author: jsuchome Date: Wed Feb 11 22:03:51 2009 New Revision: 55444 URL: http://svn.opensuse.org/viewcvs/yast?rev=55444&view=rev Log: Created tag branch-SLE-10-SP3-2_13_33 for ldap-client Added: tags/branch-SLE-10-SP3-2_13_33/ldap-client/ - copied from r55443, branches/SuSE-SLE-10-SP3-Branch/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] r55443 - in /branches/SuSE-SLE-10-SP3-Branch/ldap-client: VERSION package/yast2-ldap-client.changes src/Ldap.ycp
by jsuchome＠svn.opensuse.org 11 Feb '09

11 Feb '09

Author: jsuchome Date: Wed Feb 11 22:03:45 2009 New Revision: 55443 URL: http://svn.opensuse.org/viewcvs/yast?rev=55443&view=rev Log: - show port in the server field, read the data if there were not read yet (patch from L3 team, bnc#464203) - 2.13.33 Modified: branches/SuSE-SLE-10-SP3-Branch/ldap-client/VERSION branches/SuSE-SLE-10-SP3-Branch/ldap-client/package/yast2-ldap-client.changes branches/SuSE-SLE-10-SP3-Branch/ldap-client/src/Ldap.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/ldap-c… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/ldap-client/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/ldap-client/VERSION Wed Feb 11 22:03:45 2009 @@ -1 +1 @@ -2.13.32 +2.13.33 Modified: branches/SuSE-SLE-10-SP3-Branch/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/ldap-c… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/ldap-client/package/yast2-ldap-client.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/ldap-client/package/yast2-ldap-client.changes Wed Feb 11 22:03:45 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Feb 11 21:57:00 CET 2009 - jsuchome(a)suse.cz + +- show port in the server field, read the data if there were + not read yet (patch from L3 team, bnc#464203) +- 2.13.33 + +------------------------------------------------------------------- Wed Feb 20 16:07:43 CET 2008 - jsuchome(a)suse.cz - allow more spaces as host name separators (bnc#362946) Modified: branches/SuSE-SLE-10-SP3-Branch/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/ldap-c… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/ldap-client/src/Ldap.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/ldap-client/src/Ldap.ycp Wed Feb 11 22:03:45 2009 @@ -879,6 +879,12 @@ // this is a hack global define integer GetFirstPort (string servers) ``{ + if (bind_pass == nil && servers == "") + { + y2milestone ("--- server not read yet or empty, reading now"); + servers = ReadLdapConfEntry ("host", ""); + } + list l_servers = splitstring (servers, " \t"); string srv = l_servers[0]:""; if (!issubstring (srv, ":")) @@ -952,7 +958,8 @@ // password entering label `Password(`id(`pw), _("&LDAP Server Password")), // label - `Label (sformat (_("Server: %1"), GetFirstServer (server))), + `Label (sformat (_("Server: %1:%2"), + GetFirstServer (server), GetFirstPort (server))), // label (%1 is admin DN - string) `Label (sformat (_("Administrator: %1"), GetBindDN ())), `HBox( -- 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] r55442 - /tags/branch-Code-11-2_17_18/add-on/
by locilka＠svn.opensuse.org 11 Feb '09

11 Feb '09

Author: locilka Date: Wed Feb 11 19:14:04 2009 New Revision: 55442 URL: http://svn.opensuse.org/viewcvs/yast?rev=55442&view=rev Log: Created tag branch-Code-11-2_17_18 for add-on Added: tags/branch-Code-11-2_17_18/add-on/ - copied from r55441, branches/SuSE-Code-11-Branch/add-on/ -- 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] r55441 - in /trunk/add-on: package/yast2-add-on.changes src/add-on-workflow.ycp
by locilka＠svn.opensuse.org 11 Feb '09

11 Feb '09

Author: locilka Date: Wed Feb 11 19:13:21 2009 New Revision: 55441 URL: http://svn.opensuse.org/viewcvs/yast?rev=55441&view=rev Log: - Selecting all products available on add-on media for installation (bnc #474745). Modified: trunk/add-on/package/yast2-add-on.changes trunk/add-on/src/add-on-workflow.ycp Modified: trunk/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/package/yast2-add-on.chan… ============================================================================== --- trunk/add-on/package/yast2-add-on.changes (original) +++ trunk/add-on/package/yast2-add-on.changes Wed Feb 11 19:13:21 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 11 19:10:33 CET 2009 - locilka(a)suse.cz + +- Selecting all products available on add-on media for installation + (bnc #474745). + +------------------------------------------------------------------- Mon Feb 2 14:34:27 CET 2009 - locilka(a)suse.cz - Forcing recreating and redrawing the table of add-on products. Modified: trunk/add-on/src/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on-workflow.ycp?r… ============================================================================== --- trunk/add-on/src/add-on-workflow.ycp (original) +++ trunk/add-on/src/add-on-workflow.ycp Wed Feb 11 19:13:21 2009 @@ -431,6 +431,59 @@ return ret; } +// BNC #474745 +// Installs all the products from just added add-on media +symbol InstallProduct () { + y2milestone ("AddOnID: %1", AddOnProduct::src_id); + + if (AddOnProduct::src_id == nil || AddOnProduct::src_id < 0) { + y2error ("No source has been added"); + return `next; + } + + list <map <string, any> > all_products = Pkg::ResolvableProperties ("", `product, ""); + + // `selected and `installed products + // each map contains "name" and "version" + list <map> s_a_i_products = []; + + foreach (map <string, any> one_product, all_products, { + s_a_i_products = add (s_a_i_products, + $["name":one_product["name"]:"xyz", "version":one_product["version"]:"abc"] + ); + }); + + foreach (map <string, any> one_product, all_products, { +// map this_product = $["name":one_product["name"]:"zyx", "version":one_product["version"]:"cba"]; + + // Product doesn't match the new source ID + if (one_product["source"]:-255 != AddOnProduct::src_id) { + return; + } + + // Product is not available (either `installed or `selected or ...) + if (one_product["status"]:`available != `available) { + return; + } + +// // Available but also already installed or selected +// if (contains (s_a_i_products, this_product)) { +// y2warning ("Product %1 is already installed", this_product); +// return; +// } + + string product_name = one_product["name"]:"-Unknown-Product-"; + + y2milestone ( + "Selecting product '%1' for installation -> %2", + product_name, + Pkg::ResolvableInstall (product_name, `product) + ); + }); + + return `next; +} + symbol ProductSelect () { list<map<string,any> > all_products = Pkg::ResolvableProperties ("", `product, ""); @@ -766,14 +819,15 @@ "media" : ``(MediaSelect ()), // "catalog" : ``(CatalogSelect ()), // "product" : ``(ProductSelect ()), + "install_product" : ``(InstallProduct ()), ]; map sequence = $[ "ws_start" : "media", "media" : $[ `abort : `abort, - `next : `next, - `finish : `next, + `next : "install_product", + `finish : "install_product", ], // "catalog" : $[ // `abort : `abort, @@ -785,6 +839,11 @@ // `next : `next, // `finish : `next, // ], + "install_product" : $[ + `abort : `abort, + `next : `next, + `finish : `next, + ], ]; return Sequencer::Run(aliases, sequence); } -- 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] r55440 - in /branches/SuSE-Code-11-Branch/add-on: VERSION package/yast2-add-on.changes src/add-on-workflow.ycp
by locilka＠svn.opensuse.org 11 Feb '09

11 Feb '09

Author: locilka Date: Wed Feb 11 19:13:09 2009 New Revision: 55440 URL: http://svn.opensuse.org/viewcvs/yast?rev=55440&view=rev Log: - Selecting all products available on add-on media for installation (bnc #474745). - 2.17.18 Modified: branches/SuSE-Code-11-Branch/add-on/VERSION branches/SuSE-Code-11-Branch/add-on/package/yast2-add-on.changes branches/SuSE-Code-11-Branch/add-on/src/add-on-workflow.ycp Modified: branches/SuSE-Code-11-Branch/add-on/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/add-on/VE… ============================================================================== --- branches/SuSE-Code-11-Branch/add-on/VERSION (original) +++ branches/SuSE-Code-11-Branch/add-on/VERSION Wed Feb 11 19:13:09 2009 @@ -1 +1 @@ -2.17.17 +2.17.18 Modified: branches/SuSE-Code-11-Branch/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/add-on/pa… ============================================================================== --- branches/SuSE-Code-11-Branch/add-on/package/yast2-add-on.changes (original) +++ branches/SuSE-Code-11-Branch/add-on/package/yast2-add-on.changes Wed Feb 11 19:13:09 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Feb 11 19:10:33 CET 2009 - locilka(a)suse.cz + +- Selecting all products available on add-on media for installation + (bnc #474745). +- 2.17.18 + +------------------------------------------------------------------- Mon Feb 2 14:34:27 CET 2009 - locilka(a)suse.cz - Forcing recreating and redrawing the table of add-on products. Modified: branches/SuSE-Code-11-Branch/add-on/src/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/add-on/sr… ============================================================================== --- branches/SuSE-Code-11-Branch/add-on/src/add-on-workflow.ycp (original) +++ branches/SuSE-Code-11-Branch/add-on/src/add-on-workflow.ycp Wed Feb 11 19:13:09 2009 @@ -431,6 +431,59 @@ return ret; } +// BNC #474745 +// Installs all the products from just added add-on media +symbol InstallProduct () { + y2milestone ("AddOnID: %1", AddOnProduct::src_id); + + if (AddOnProduct::src_id == nil || AddOnProduct::src_id < 0) { + y2error ("No source has been added"); + return `next; + } + + list <map <string, any> > all_products = Pkg::ResolvableProperties ("", `product, ""); + + // `selected and `installed products + // each map contains "name" and "version" + list <map> s_a_i_products = []; + + foreach (map <string, any> one_product, all_products, { + s_a_i_products = add (s_a_i_products, + $["name":one_product["name"]:"xyz", "version":one_product["version"]:"abc"] + ); + }); + + foreach (map <string, any> one_product, all_products, { +// map this_product = $["name":one_product["name"]:"zyx", "version":one_product["version"]:"cba"]; + + // Product doesn't match the new source ID + if (one_product["source"]:-255 != AddOnProduct::src_id) { + return; + } + + // Product is not available (either `installed or `selected or ...) + if (one_product["status"]:`available != `available) { + return; + } + +// // Available but also already installed or selected +// if (contains (s_a_i_products, this_product)) { +// y2warning ("Product %1 is already installed", this_product); +// return; +// } + + string product_name = one_product["name"]:"-Unknown-Product-"; + + y2milestone ( + "Selecting product '%1' for installation -> %2", + product_name, + Pkg::ResolvableInstall (product_name, `product) + ); + }); + + return `next; +} + symbol ProductSelect () { list<map<string,any> > all_products = Pkg::ResolvableProperties ("", `product, ""); @@ -766,14 +819,15 @@ "media" : ``(MediaSelect ()), // "catalog" : ``(CatalogSelect ()), // "product" : ``(ProductSelect ()), + "install_product" : ``(InstallProduct ()), ]; map sequence = $[ "ws_start" : "media", "media" : $[ `abort : `abort, - `next : `next, - `finish : `next, + `next : "install_product", + `finish : "install_product", ], // "catalog" : $[ // `abort : `abort, @@ -785,6 +839,11 @@ // `next : `next, // `finish : `next, // ], + "install_product" : $[ + `abort : `abort, + `next : `next, + `finish : `next, + ], ]; return Sequencer::Run(aliases, sequence); } -- 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] r55439 - /trunk/storage/storage/src/include/custom_part_lib.ycp
by kmachalkova＠svn.opensuse.org 11 Feb '09

11 Feb '09

Author: kmachalkova Date: Wed Feb 11 18:10:13 2009 New Revision: 55439 URL: http://svn.opensuse.org/viewcvs/yast?rev=55439&view=rev Log: One more (bnc#458010) Modified: trunk/storage/storage/src/include/custom_part_lib.ycp Modified: trunk/storage/storage/src/include/custom_part_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_lib.ycp (original) +++ trunk/storage/storage/src/include/custom_part_lib.ycp Wed Feb 11 18:10:13 2009 @@ -688,7 +688,7 @@ define map<string,any> HandleFsChanged( boolean init, map<string,any> new, symbol old_fs, map file_systems ) ``{ - boolean undo_change = false; + boolean apply_change = false; list<string> not_used_mp = []; symbol used_fs = new["used_fs"]:`unknown; map selected_fs = file_systems[used_fs]:$[]; @@ -710,12 +710,12 @@ in the system. Do not file bugs against the file system itself if it does not work properly or at all. -Undo the change of file system? +Really use this file system? "), Product::name ); - undo_change = Popup::YesNo(message); + apply_change = Popup::YesNo(message); } - if( !undo_change && !Stage::initial() ) + if( apply_change && !Stage::initial() ) { if( size(pkg_for_fs[used_fs]:[])>0 ) { @@ -723,17 +723,17 @@ y2milestone( "HandleFsChanged install %1 ret:%2", pkg_for_fs[used_fs]:[], r ); if( !r ) - undo_change = true; + apply_change = false; } } - if( undo_change ) + if( !apply_change ) { new["used_fs"] = old_fs; UI::ChangeWidget(`id(`fs), `Value, old_fs ); } } - if( !undo_change && UI::WidgetExists( `id(`crypt_fs) )) + if( apply_change && UI::WidgetExists( `id(`crypt_fs) )) { boolean cr = selected_fs[`crypt]:true; @@ -745,7 +745,7 @@ } } - if( !undo_change ) + if( apply_change ) { //////////////////////////////////////////////// // switch between swap and other mountpoints -- 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] r55438 - /tags/branch-Code-11-2_17_17/online-update/
by locilka＠svn.opensuse.org 11 Feb '09

11 Feb '09

Author: locilka Date: Wed Feb 11 17:53:11 2009 New Revision: 55438 URL: http://svn.opensuse.org/viewcvs/yast?rev=55438&view=rev Log: Created tag branch-Code-11-2_17_17 for online-update Added: tags/branch-Code-11-2_17_17/online-update/ - copied from r55437, branches/SuSE-Code-11-Branch/online-update/ -- 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] r55437 - in /trunk/online-update: package/yast2-online-update.changes src/inst_you.ycp
by locilka＠svn.opensuse.org 11 Feb '09

11 Feb '09

Author: locilka Date: Wed Feb 11 17:52:25 2009 New Revision: 55437 URL: http://svn.opensuse.org/viewcvs/yast?rev=55437&view=rev Log: - Calling solver if some patches are selected during second stage installation (bnc #474601). Modified: trunk/online-update/package/yast2-online-update.changes trunk/online-update/src/inst_you.ycp Modified: trunk/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/package/yast2-onli… ============================================================================== --- trunk/online-update/package/yast2-online-update.changes (original) +++ trunk/online-update/package/yast2-online-update.changes Wed Feb 11 17:52:25 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 11 17:47:24 CET 2009 - locilka(a)suse.cz + +- Calling solver if some patches are selected during second stage + installation (bnc #474601). + +------------------------------------------------------------------- Wed Feb 11 15:02:14 CET 2009 - jsuchome(a)suse.cz - refresh the source data which were possibly cleared (bnc#474711) Modified: trunk/online-update/src/inst_you.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/inst_you.ycp?r… ============================================================================== --- trunk/online-update/src/inst_you.ycp (original) +++ trunk/online-update/src/inst_you.ycp Wed Feb 11 17:52:25 2009 @@ -286,6 +286,21 @@ } } } + + // BNC #474601, Solver run after selecting patches is required + if (! Pkg::PkgSolve (true)) + { + y2warning ("Cannot solve automatically, user decision required"); + + symbol ret_sel = PackagesUI::RunPackageSelector($["mode":`youMode]); + if (ret_sel == `cancel) + { + y2milestone ("package selector canceled -> `next"); + Pkg::SetSolverFlags (solver_flags_backup); + return `next; + } + } + // install the patches OnlineUpdateCallbacks::RegisterOnlineUpdateCallbacks(); WFM::call( "online_update_install" ); -- 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] r55436 - in /branches/SuSE-Code-11-Branch/online-update: VERSION package/yast2-online-update.changes src/inst_you.ycp
by locilka＠svn.opensuse.org 11 Feb '09

11 Feb '09

Author: locilka Date: Wed Feb 11 17:52:13 2009 New Revision: 55436 URL: http://svn.opensuse.org/viewcvs/yast?rev=55436&view=rev Log: - Calling solver if some patches are selected during second stage installation (bnc #474601). - 2.17.17 Modified: branches/SuSE-Code-11-Branch/online-update/VERSION branches/SuSE-Code-11-Branch/online-update/package/yast2-online-update.changes branches/SuSE-Code-11-Branch/online-update/src/inst_you.ycp Modified: branches/SuSE-Code-11-Branch/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/online-up… ============================================================================== --- branches/SuSE-Code-11-Branch/online-update/VERSION (original) +++ branches/SuSE-Code-11-Branch/online-update/VERSION Wed Feb 11 17:52:13 2009 @@ -1 +1 @@ -2.17.16 +2.17.17 Modified: branches/SuSE-Code-11-Branch/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/online-up… ============================================================================== --- branches/SuSE-Code-11-Branch/online-update/package/yast2-online-update.changes (original) +++ branches/SuSE-Code-11-Branch/online-update/package/yast2-online-update.changes Wed Feb 11 17:52:13 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Feb 11 17:47:24 CET 2009 - locilka(a)suse.cz + +- Calling solver if some patches are selected during second stage + installation (bnc #474601). +- 2.17.17 + +------------------------------------------------------------------- Wed Feb 11 13:40:53 CET 2009 - jsuchome(a)suse.cz - refresh the source data which were possibly cleared (bnc#474711) Modified: branches/SuSE-Code-11-Branch/online-update/src/inst_you.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/online-up… ============================================================================== --- branches/SuSE-Code-11-Branch/online-update/src/inst_you.ycp (original) +++ branches/SuSE-Code-11-Branch/online-update/src/inst_you.ycp Wed Feb 11 17:52:13 2009 @@ -286,6 +286,21 @@ } } } + + // BNC #474601, Solver run after selecting patches is required + if (! Pkg::PkgSolve (true)) + { + y2warning ("Cannot solve automatically, user decision required"); + + symbol ret_sel = PackagesUI::RunPackageSelector($["mode":`youMode]); + if (ret_sel == `cancel) + { + y2milestone ("package selector canceled -> `next"); + Pkg::SetSolverFlags (solver_flags_backup); + return `next; + } + } + // install the patches OnlineUpdateCallbacks::RegisterOnlineUpdateCallbacks(); WFM::call( "online_update_install" ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0