Author: locilka Date: Thu Nov 8 16:55:28 2007 New Revision: 41893 URL: http://svn.opensuse.org/viewcvs/yast?rev=41893&view=rev Log: - Extended AskLicenseAgreement function not to skip already accepted license if such behavior requested (because of 'going back' in the installation workflow). 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=41893&r1=41892&r2=41893&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Thu Nov 8 16:55:28 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Nov 8 16:53:48 CET 2007 - locilka@suse.cz + +- Extended AskLicenseAgreement function not to skip already + accepted license if such behavior requested (because of 'going + back' in the installation workflow). + +------------------------------------------------------------------- Wed Nov 7 12:48:52 CET 2007 - locilka@suse.cz - AutoinstSoftware::post_packages moved to Modified: trunk/packager/src/modules/ProductLicense.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/ProductLicense.ycp?rev=41893&r1=41892&r2=41893&view=diff ============================================================================== --- trunk/packager/src/modules/ProductLicense.ycp (original) +++ trunk/packager/src/modules/ProductLicense.ycp Thu Nov 8 16:55:28 2007 @@ -544,10 +544,13 @@ * @param boolean enable_back sets the back_button status * @param boolean base_product defines whether it is a base or add-on product * true means base product, false add-on product + * @param require_agreement means that even if the license (or the very same license) + * has been already accepetd, ask user to accept it again (because of 'going back' + * in the installation proposal). */ global symbol AskLicenseAgreement (integer src_id, string dir, list<string> patterns, string action, boolean enable_back, - boolean base_product) + boolean base_product, boolean require_agreement) { string lic_lang = ""; map licenses = $[]; @@ -619,8 +622,9 @@ string base_license = WhichLicenceFile (license_ident_lang, licenses); string license_ident = GetLicenseIdentString (base_license); + // agreement might be required even if license has been already accepted // defined, properly ($md5sum(32)-(1)$size(1..n)) - if (license_ident != nil && size (license_ident) > 33 && IsLicenseAlreadyAccepted (license_ident)) { + if (require_agreement != true && license_ident != nil && size (license_ident) > 33 && IsLicenseAlreadyAccepted (license_ident)) { y2milestone ("License has been already accepted"); CleanUpLicense (tmpdir); @@ -802,7 +806,7 @@ [ "license\\.txt", "license\\.%1\\.txt" ], "abort", // back button is disabled - false, false); + false, false, false); } global symbol AskFirstStageLicenseAgreement (string action) { @@ -817,13 +821,13 @@ [ "license\\.txt", "license\\.%1\\.txt" ], action, // back button is enabled - enable_back, true); + enable_back, true, true); } global symbol AskInstalledLicenseAgreement (string directory, list<string> patterns, string action) { - return AskLicenseAgreement (nil, directory, patterns, action, false, true); + return AskLicenseAgreement (nil, directory, patterns, action, false, true, false); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org