July 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r65083 - in /branches/SuSE-Code-11-SP2-Branch/wagon: package/yast2-wagon.changes src/modules/Wagon.ycp
by lslezak＠svn2.opensuse.org 29 Jul '11

29 Jul '11

Author: lslezak Date: Fri Jul 29 09:14:37 2011 New Revision: 65083 URL: http://svn.opensuse.org/viewcvs/yast?rev=65083&view=rev Log: - display solver error in the migration propsal, do not allow starting migration when there is an unsolved problem (bnc#708676) Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes Fri Jul 29 09:14:37 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 29 07:12:14 UTC 2011 - lslezak(a)suse.cz + +- display solver error in the migration propsal, do not allow + starting migration when there is an unsolved problem (bnc#708676) + +------------------------------------------------------------------- Thu Jul 28 11:56:48 UTC 2011 - lslezak(a)suse.cz - fixed registration status check when registering against SMT Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp Fri Jul 29 09:14:37 2011 @@ -451,7 +451,8 @@ Pkg::SetSolverFlags($["ignoreAlreadyRecommended" : true]); } - Pkg::PkgSolve(true); + // set the solve error flag for packages proposal + Update::solve_errors = Pkg::PkgSolve(true) ? 0 : Pkg::PkgSolveErrors(); already_proposed = 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] r65082 - /branches/SuSE-Code-11-SP2-Branch/wagon/src/include/common_func.ycp
by lslezak＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: lslezak Date: Thu Jul 28 22:55:11 2011 New Revision: 65082 URL: http://svn.opensuse.org/viewcvs/yast?rev=65082&view=rev Log: improved package manager reset function: - no need to neutralize selected resolvables, after pool reload the status is reset anyway - reset also solver options and DUP repositories Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/include/common_func.ycp Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/include/common_func.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/include/common_func.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/include/common_func.ycp Thu Jul 28 22:55:11 2011 @@ -126,24 +126,23 @@ ); y2milestone ("Reseting Pkg"); - Pkg::PkgApplReset(); - Pkg::PkgReset(); - symbol status = nil; - string name = nil; + list<integer> repos = Pkg::GetUpgradeRepos(); + if (size(repos) > 0) + { + y2milestone("Resetting upgrade repos config"); + foreach(integer repo, repos, {Pkg::RemoveUpgradeRepo(repo);}); + } - y2milestone ("Neutralizing all resolvables"); - foreach (symbol resolvable, [`pattern, `patch, `package, `product, `srcpackage], { - Pkg::ResolvableNeutral ("" /* all */, resolvable, true /* force */); - }); - - y2milestone ("Running solver"); - Pkg::PkgSolve (true); + // reset solver flags + Pkg::SetSolverFlags($["reset" : true]); Pkg::TargetFinish(); Pkg::SourceFinishAll(); Wagon::InitPkg(); + + y2milestone ("Running solver"); Pkg::PkgSolve (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] r65081 - in /branches/SuSE-Code-11-SP2-Branch/wagon: package/yast2-wagon.changes src/clients/wagon_dup_repositories.ycp
by lslezak＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: lslezak Date: Thu Jul 28 22:50:40 2011 New Revision: 65081 URL: http://svn.opensuse.org/viewcvs/yast?rev=65081&view=rev Log: - reset and repropose package selection when migration type is changed (bnc#708641) Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes Thu Jul 28 22:50:40 2011 @@ -5,6 +5,8 @@ (bnc#708888) - properly display selected migration type when going back in the migration workflow (bnc#708667) +- reset and repropose package selection when migration type is + changed (bnc#708641) ------------------------------------------------------------------- Mon Jul 18 12:48:20 UTC 2011 - lslezak(a)suse.cz Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp Thu Jul 28 22:50:40 2011 @@ -22,6 +22,7 @@ import "Wizard"; import "Popup"; + include "wagon/common_func.ycp"; define list TableContent() { @@ -195,6 +196,9 @@ symbol ret = nil; + list<integer> prev_dup_repos = Wagon::DupRepos(); + boolean prev_manual_selection = Wagon::ManualRepoSelection(); + while (true) { // go to advanced config it was used previously ret = (Wagon::ManualRepoSelection()) ? `advanced : (symbol)UI::UserInput(); @@ -286,6 +290,15 @@ } } + if (ret == `next && (prev_dup_repos != Wagon::DupRepos() || prev_manual_selection != Wagon::ManualRepoSelection())) + { + y2milestone("DUP repository config has been changed, repropose package selection"); + Wagon::ResetDUPProposal(); + + // reset current package selection + ResetPackager(); + } + 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] r65080 - in /trunk/yast2: ./ library/modules/ library/network/src/ library/network/testsuite/tests/ package/
by mvidner＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: mvidner Date: Thu Jul 28 16:51:20 2011 New Revision: 65080 URL: http://svn.opensuse.org/viewcvs/yast?rev=65080&view=rev Log: Added Assert; fixed INTERFACETYPE=br (bnc#704999). via svn merge -r 65077:65079 http://svn.opensuse.org/svn/yast/branches/SuSE-Code-11-SP2-Branch/yast2 Added: trunk/yast2/library/modules/Assert.ycp - copied unchanged from r65079, branches/SuSE-Code-11-SP2-Branch/yast2/library/modules/Assert.ycp trunk/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.err - copied unchanged from r65079, branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.err trunk/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.out - copied unchanged from r65079, branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.out trunk/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.ycp - copied unchanged from r65079, branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.ycp Modified: trunk/yast2/ (props changed) trunk/yast2/VERSION trunk/yast2/library/network/src/NetworkInterfaces.ycp trunk/yast2/package/ (props changed) trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=65080&r1=65079… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Thu Jul 28 16:51:20 2011 @@ -1 +1 @@ -2.21.7 +2.21.8 Modified: trunk/yast2/library/network/src/NetworkInterfaces.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/Networ… ============================================================================== --- trunk/yast2/library/network/src/NetworkInterfaces.ycp (original) +++ trunk/yast2/library/network/src/NetworkInterfaces.ycp Thu Jul 28 16:51:20 2011 @@ -182,10 +182,27 @@ list<string> TypeByKeyValue = [ "INTERFACETYPE", - "TUNNEL", ]; list<list<string> > TypeByKeyExistence = [ ["ETHERDEVICE", "vlan"], + ["WIRELESS_MODE", "wlan"], + ["MODEM_DEVICE", "ppp"], + ]; +list<list<string> > TypeByValueMatch = [ + ["BONDING_MASTER", "yes", "bond"], + ["BRIDGE", "yes", "br"], + ["WIRELESS", "yes", "wlan"], + ["TUNNEL", "tap", "tap"], + ["TUNNEL", "tun", "tun"], + ["TUNNEL", "sit", "sit"], + ["TUNNEL", "gre", "gre"], + ["TUNNEL", "ipip", "ipip"], + ["PPPMODE", "pppoe", "ppp"], + ["PPPMODE", "pppoatm", "ppp"], + ["PPPMODE", "capi-adsl", "ppp"], + ["PPPMODE", "pptp", "ppp"], + ["ENCAP", "syncppp", "isdn"], + ["ENCAP", "rawip", "isdn"], ]; /** @@ -193,6 +210,14 @@ */ global string GetTypeFromIfcfg(ifcfg_t ifcfg) { string type = nil; // unknown + foreach(list<string> key_type, TypeByValueMatch, { + string rule_key = key_type[0]:""; + string rule_value = key_type[1]:""; + string rule_type = key_type[2]:""; + if (ifcfg[rule_key]:"" == rule_value) { + type = rule_type; + } + }); foreach(list<string> key_type, TypeByKeyExistence, { string rule_key = key_type[0]:""; string rule_type = key_type[1]:""; 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 Thu Jul 28 16:51:20 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jul 28 16:23:46 CEST 2011 - mvidner(a)suse.cz + +- Fixed NetworkInterfaces::GetTypeFromIfcfg to recognize bridges (bnc#704999). +- 2.21.8 + +------------------------------------------------------------------- Wed Jul 27 09:29:36 UTC 2011 - lslezak(a)suse.cz - command line - properly display multiline help texts (bnc#708553) -- 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] r65079 - in /branches/SuSE-Code-11-SP2-Branch/yast2: ./ library/network/src/ library/network/testsuite/tests/ package/
by mvidner＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: mvidner Date: Thu Jul 28 16:25:36 2011 New Revision: 65079 URL: http://svn.opensuse.org/viewcvs/yast?rev=65079&view=rev Log: Fixed NetworkInterfaces::GetTypeFromIfcfg to recognize bridges (bnc#704999). otherwise yast2 lan would erroneously put INTERFACETYPE=br in ifcfg Added test cases, using the new Assert module Added: branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.err branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.out branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.ycp (with props) Modified: branches/SuSE-Code-11-SP2-Branch/yast2/VERSION branches/SuSE-Code-11-SP2-Branch/yast2/library/network/src/NetworkInterfaces.ycp branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes Modified: branches/SuSE-Code-11-SP2-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/VERSION Thu Jul 28 16:25:36 2011 @@ -1 +1 @@ -2.17.104 +2.17.105 Modified: branches/SuSE-Code-11-SP2-Branch/yast2/library/network/src/NetworkInterfaces.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/library/network/src/NetworkInterfaces.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/library/network/src/NetworkInterfaces.ycp Thu Jul 28 16:25:36 2011 @@ -182,10 +182,27 @@ list<string> TypeByKeyValue = [ "INTERFACETYPE", - "TUNNEL", ]; list<list<string> > TypeByKeyExistence = [ ["ETHERDEVICE", "vlan"], + ["WIRELESS_MODE", "wlan"], + ["MODEM_DEVICE", "ppp"], + ]; +list<list<string> > TypeByValueMatch = [ + ["BONDING_MASTER", "yes", "bond"], + ["BRIDGE", "yes", "br"], + ["WIRELESS", "yes", "wlan"], + ["TUNNEL", "tap", "tap"], + ["TUNNEL", "tun", "tun"], + ["TUNNEL", "sit", "sit"], + ["TUNNEL", "gre", "gre"], + ["TUNNEL", "ipip", "ipip"], + ["PPPMODE", "pppoe", "ppp"], + ["PPPMODE", "pppoatm", "ppp"], + ["PPPMODE", "capi-adsl", "ppp"], + ["PPPMODE", "pptp", "ppp"], + ["ENCAP", "syncppp", "isdn"], + ["ENCAP", "rawip", "isdn"], ]; /** @@ -193,6 +210,14 @@ */ global string GetTypeFromIfcfg(ifcfg_t ifcfg) { string type = nil; // unknown + foreach(list<string> key_type, TypeByValueMatch, { + string rule_key = key_type[0]:""; + string rule_value = key_type[1]:""; + string rule_type = key_type[2]:""; + if (ifcfg[rule_key]:"" == rule_value) { + type = rule_type; + } + }); foreach(list<string> key_type, TypeByKeyExistence, { string rule_key = key_type[0]:""; string rule_type = key_type[1]:""; Added: branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.err URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== (empty) Added: branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.out (added) +++ branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.out Thu Jul 28 16:25:36 2011 @@ -0,0 +1,4 @@ +Dump NetworkInterfaces::GetTypeFromIfcfg +Return true +Return true +Return true Added: branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.ycp Thu Jul 28 16:25:36 2011 @@ -0,0 +1,40 @@ +// bnc#704999 +{ + +include "testsuite.ycp"; +import "Assert"; +import "NetworkInterfaces"; + +typedef map<string, any> ifcfg_t; + +ifcfg_t mybond = $[ + "BOOTPROTO": "dhcp", + "BONDING_MASTER": "yes", + "BONDING_SLAVE_0": "eth0", + "BONDING_SLAVE_1": "eth1", +]; + +ifcfg_t mybridged = $[ + "BOOTPROTO": "dhcp", + "BRIDGE": "yes", + "BRIDGE_PORTS": "eth0 tap0", +]; + +ifcfg_t myvirt = $[ + "BOOTPROTO": "static", + "TUNNEL": "tap", +]; + +DUMP("NetworkInterfaces::GetTypeFromIfcfg"); +TEST(``( + Assert::Equal("bond", NetworkInterfaces::GetTypeFromIfcfg(mybond)) + ), [], nil); +TEST(``( + Assert::Equal("br", NetworkInterfaces::GetTypeFromIfcfg(mybridged)) + ), [], nil); +TEST(``( + Assert::Equal("tap", NetworkInterfaces::GetTypeFromIfcfg(myvirt)) + ), [], nil); + +/*EOF*/ +} Modified: branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes Thu Jul 28 16:25:36 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jul 28 16:23:46 CEST 2011 - mvidner(a)suse.cz + +- Fixed NetworkInterfaces::GetTypeFromIfcfg to recognize bridges (bnc#704999). +- 2.17.105 + +------------------------------------------------------------------- Thu Jul 28 13:46:22 CEST 2011 - jsuchome(a)suse.cz - adapt the message shown when compliance check fails -- 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] r65078 - /branches/SuSE-Code-11-SP2-Branch/yast2/library/modules/Assert.ycp
by mvidner＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: mvidner Date: Thu Jul 28 16:25:30 2011 New Revision: 65078 URL: http://svn.opensuse.org/viewcvs/yast?rev=65078&view=rev Log: New module: Assert Assert::Equal(readability, good); Assert::EqualMsg(0, user_id, "you must be root to run these tests"); Assert::Equal("Oh Assert, how could I have lived without you so long?", Mode::mood()); Added: branches/SuSE-Code-11-SP2-Branch/yast2/library/modules/Assert.ycp (with props) Added: branches/SuSE-Code-11-SP2-Branch/yast2/library/modules/Assert.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/library/modules/Assert.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/yast2/library/modules/Assert.ycp Thu Jul 28 16:25:30 2011 @@ -0,0 +1,36 @@ +/** + * File: Assert.ycp + * Summary: Assertions for test cases + * Authors: Martin Vidner <mvidner(a)suse.cz> + */ +{ +module "Assert"; + +/** + * @param expected expected value of test + * @param actual actual value of test + * @param fail_message will be logged if test fails + * @return whether test succeeds + */ +global boolean EqualMsg(any expected, any actual, string fail_message) { + if (expected == actual) { + return true; + } + else { + y2error ("%1", fail_message); + return false; + } +} + +/** + * @param expected expected value of test + * @param actual actual value of test + * @return whether test succeeds + */ +global boolean Equal(any expected, any actual) { + string fail_message = sformat ("assertion failure, expected '%1', got '%2'", expected, actual); + return EqualMsg(expected, actual, fail_message); +} + +/* EOF */ +} -- 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] r65077 - in /branches/SuSE-Code-11-SP2-Branch/wagon: package/yast2-wagon.changes src/clients/wagon_dup_repositories.ycp src/modules/Wagon.ycp
by lslezak＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: lslezak Date: Thu Jul 28 15:04:22 2011 New Revision: 65077 URL: http://svn.opensuse.org/viewcvs/yast?rev=65077&view=rev Log: - properly display selected migration type when going back in the migration workflow (bnc#708667) Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes Thu Jul 28 15:04:22 2011 @@ -3,6 +3,8 @@ - fixed registration status check when registering against SMT (bnc#708888) +- properly display selected migration type when going back in + the migration workflow (bnc#708667) ------------------------------------------------------------------- Mon Jul 18 12:48:20 UTC 2011 - lslezak(a)suse.cz Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp Thu Jul 28 15:04:22 2011 @@ -154,6 +154,8 @@ { // heading text string heading_text = _("Migration Type"); + // full migration? + boolean full = sort(Wagon::DupRepos()) == sort(Pkg::SourceGetCurrent(true)); term contents = `VBox( // frame label @@ -163,9 +165,9 @@ `RadioButtonGroup(`id(`migration_type), `VBox( // radio button - `Left(`RadioButton(`id(`minimal), _("&Minimal migration (only the core packages)"), true)), + `Left(`RadioButton(`id(`minimal), _("&Minimal migration (only the core packages)"), !full)), // radio button - `Left(`RadioButton(`id(`full), _("&Full migration (all packages)"))) + `Left(`RadioButton(`id(`full), _("&Full migration (all packages)"), full)) ) ) ) @@ -194,7 +196,8 @@ symbol ret = nil; while (true) { - ret = (symbol)UI::UserInput(); + // go to advanced config it was used previously + ret = (Wagon::ManualRepoSelection()) ? `advanced : (symbol)UI::UserInput(); if (ret == `next) { @@ -207,6 +210,7 @@ // DUP: all repositories y2milestone("Selected full migration, using %1 repositories", size(Pkg::SourceGetCurrent(true))); Wagon::SetDupRepos(Pkg::SourceGetCurrent(true)); + Wagon::SetManualRepoSelection(false); } else if (mtype == `minimal) { @@ -229,6 +233,7 @@ y2milestone("Converted aliases to ids: %1", added_repos); Wagon::SetDupRepos(added_repos); + Wagon::SetManualRepoSelection(false); } else { @@ -255,14 +260,20 @@ y2milestone("Manual DUP repository selection selected"); ret = DupSelectionDialog(); - if (ret == `abort || ret == `close || ret == `next) + if (ret == `abort || ret == `close) { break; } + else if (ret == `next) + { + Wagon::SetManualRepoSelection(true); + break; + } else if (ret == `back) { // refresh the dialog SetMigrationSelectionDialogContent(); + Wagon::SetManualRepoSelection(false); } else { Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp Thu Jul 28 15:04:22 2011 @@ -123,6 +123,20 @@ dup_repos = repos; } + boolean manual_repo_selection = false; + + // manual or automatic DUP repo selection? + global boolean ManualRepoSelection() + { + return manual_repo_selection; + } + + global void SetManualRepoSelection(boolean manual) + { + y2milestone("Manual DUP repo selection: %1", manual); + manual_repo_selection = manual; + } + // list of repositories (aliases) added by suse_register list<string> new_registration_repos = []; -- 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] r65076 - in /branches/SuSE-Code-11-SP2-Branch/wagon: package/yast2-wagon.changes src/clients/wagon_registration_check.ycp src/modules/Wagon.ycp
by lslezak＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: lslezak Date: Thu Jul 28 13:59:36 2011 New Revision: 65076 URL: http://svn.opensuse.org/viewcvs/yast?rev=65076&view=rev Log: - fixed registration status check when registering against SMT (bnc#708888) Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_registration_check.ycp branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes Thu Jul 28 13:59:36 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jul 28 11:56:48 UTC 2011 - lslezak(a)suse.cz + +- fixed registration status check when registering against SMT + (bnc#708888) + +------------------------------------------------------------------- Mon Jul 18 12:48:20 UTC 2011 - lslezak(a)suse.cz - added new core/full migration selection dialog Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_registration_check.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_registration_check.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_registration_check.ycp Thu Jul 28 13:59:36 2011 @@ -232,6 +232,14 @@ // some other problem and user has to be informed about it define boolean Interactive(map<string,any> status) { + // SMT doesn't write /var/lib/suseRegister/registration-status.xml file + // so we cannot get any registration details, assume the system is fully registered + if (status["ncc"]:nil == false) + { + y2milestone("SMT server is used, assuming fully registered system"); + return false; + } + // the system is not registered at all if (status["registered_system"]:false) { Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp Thu Jul 28 13:59:36 2011 @@ -761,6 +761,50 @@ return true; } + /** + * Check whether NCC or SMT is used for registration + */ + define boolean NCCUsed() + { + // check /etc/suseRegister.conf content + string conf = (string)SCR::Read(.target.string, "/etc/suseRegister.conf"); + + if (conf == nil) + { + y2error("Cannot read /etc/suseRegister.conf"); + return nil; + } + + list<string> lines = splitstring(conf, "\n"); + + boolean found_url = false; + boolean found_ncc = false; + + foreach(string line, lines, { + if (regexpmatch(line, "^[ \t]*url[ \t]*=[ \t]*")) + { + found_url = true; + y2milestone("Found registration URL option: %1", line); + + if (regexpmatch(line, "^[ \t]*url[ \t]*=[ \t]*https://secure-www.novell.com/center/regsvc/*[ \t]*(#*.*)*")) + { + found_ncc = true; + y2milestone("NCC URL found"); + } + } + }); + + if (!found_url) + { + y2error("No url option found in /etc/suseRegister.conf"); + return nil; + } + + y2milestone("Found NCC registration server: %1", found_ncc); + + return found_ncc; + } + /* * Read registration status and sort products according their status * @param file Read this registration status file @@ -873,6 +917,7 @@ * @return map<string,any> result: $[ * "registered_system" : (boolean) - true registration was run, false registration has never run or there is no product to register (e.g. openSUSE installation) or the registration completely failed + "ncc" : (boolean) - true - NCC is used for registration, false - a SMT server is configured, nil - not configured or other error "timestamp" : (integer) - time when the status was saved (unix time), -1 in an unregistered system "registered" : (list<string>) - registered products "provisional" : (list<string>) - products with provisional subscription (registered, but no updates available) @@ -884,7 +929,10 @@ */ global define map<string,any> RegistrationStatus() { - return RegistrationStatusFromFile(RegistrationStatus::RegFile()); + map<string,any> ret = RegistrationStatusFromFile(RegistrationStatus::RegFile()); + ret["ncc"] = NCCUsed(); + + return ret; } /* EOF */ } -- 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] r65075 - in /branches/SuSE-Code-11-SP2-Branch/wagon: ./ agents/ doc/ doc/autodocs/ src/ src/clients/ src/config/ src/include/ src/modules/ testsuite/
by lslezak＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: lslezak Date: Thu Jul 28 13:56:18 2011 New Revision: 65075 URL: http://svn.opensuse.org/viewcvs/yast?rev=65075&view=rev Log: updated snv:ignore properties Modified: branches/SuSE-Code-11-SP2-Branch/wagon/ (props changed) branches/SuSE-Code-11-SP2-Branch/wagon/agents/ (props changed) branches/SuSE-Code-11-SP2-Branch/wagon/doc/ (props changed) branches/SuSE-Code-11-SP2-Branch/wagon/doc/autodocs/ (props changed) branches/SuSE-Code-11-SP2-Branch/wagon/src/ (props changed) branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/ (props changed) branches/SuSE-Code-11-SP2-Branch/wagon/src/config/ (props changed) branches/SuSE-Code-11-SP2-Branch/wagon/src/include/ (props changed) branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/ (props changed) branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/ (props changed) -- 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] r65074 - /tags/branch-Code-11-SP2-2_17_104/yast2/
by jsuchome＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: jsuchome Date: Thu Jul 28 13:51:20 2011 New Revision: 65074 URL: http://svn.opensuse.org/viewcvs/yast?rev=65074&view=rev Log: Created tag branch-Code-11-SP2-2_17_104 for yast2 Added: tags/branch-Code-11-SP2-2_17_104/yast2/ (props changed) - copied from r65073, branches/SuSE-Code-11-SP2-Branch/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0