[yast-commit] r60222 - in /trunk/packager: package/yast2-packager.changes src/modules/ProductLicense.ycp

Author: locilka Date: Mon Jan 4 16:19:12 2010 New Revision: 60222 URL: http://svn.opensuse.org/viewcvs/yast?rev=60222&view=rev Log: Fixed accepting/declining the multilicense agreement. Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/ProductLicense.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=60222&r1=60221&r2=60222&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Mon Jan 4 16:19:12 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +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 - ProductLicense prepared for multi-license dialogs (FATE #306295). Modified: trunk/packager/src/modules/ProductLicense.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/ProductLicense.ycp?rev=60222&r1=60221&r2=60222&view=diff ============================================================================== --- trunk/packager/src/modules/ProductLicense.ycp (original) +++ trunk/packager/src/modules/ProductLicense.ycp Mon Jan 4 16:19:12 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 tmp_licenses, licenses, { - symbol tmp_ret = HandleLicenseDialogRet (tmp_licenses, base_product, action); - }); + map tmp_licenses = $[]; + ret = HandleLicenseDialogRet (tmp_licenses, base_product, action); + y2milestone ("Dialog ret: %1", ret); } // store already accepted license IDs -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org