[yast-commit] r60221 - in /branches/SuSE-Code-11-SP1-Branch/packager: package/yast2-packager.changes src/modules/ProductLicense.ycp
Author: locilka
Date: Mon Jan 4 16:18:56 2010
New Revision: 60221
URL: http://svn.opensuse.org/viewcvs/yast?rev=60221&view=rev
Log:
Fixed accepting/declining the multilicense agreement.
Modified:
branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes
branches/SuSE-Code-11-SP1-Branch/packager/src/modules/ProductLicense.ycp
Modified: branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes?rev=60221&r1=60220&r2=60221&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes (original)
+++ branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes Mon Jan 4 16:18:56 2010
@@ -1,3 +1,8 @@
+------------------------------------------------------------------
+Mon Jan 4 16:18:08 CET 2010 - locilka@suse.cz
+
+- Fixed accepting/declining the multilicense agreement.
+
-------------------------------------------------------------------
Fri Dec 11 16:48:58 CET 2009 - locilka@suse.cz
Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/modules/ProductLicense.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packager/src/modules/ProductLicense.ycp?rev=60221&r1=60220&r2=60221&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/packager/src/modules/ProductLicense.ycp (original)
+++ branches/SuSE-Code-11-SP1-Branch/packager/src/modules/ProductLicense.ycp Mon Jan 4 16:18:56 2010
@@ -790,8 +790,10 @@
string eula_id = nil;
foreach (string one_license_id, license_ids, {
- if (AcceptanceNeeded (one_license_id))
+ if (AcceptanceNeeded (one_license_id) != true) {
+ y2milestone ("License %1 does not need to be accepted", one_license_id);
return;
+ }
eula_id = sformat ("eula_%1", one_license_id);
if ((boolean) UI::WidgetExists (`id (eula_id)) != true) {
@@ -800,7 +802,10 @@
}
// All licenses have to be accepted
- if (regexpmatch ((string) UI::QueryWidget(`id (eula_id), `CurrentButton), "^yes_")) {
+ string license_accepted = (string) UI::QueryWidget (`id (eula_id), `CurrentButton);
+ y2milestone ("License %1 accepted: %2", eula_id, license_accepted);
+
+ if (! regexpmatch (license_accepted, "^yes_")) {
accepted = false;
break;
}
@@ -1124,9 +1129,9 @@
y2milestone("AutoYaST: License has been accepted automatically");
ret = `accepted;
} else {
- foreach (map
participants (1)
-
locilka@svn.opensuse.org