Author: locilka Date: Mon Jun 22 11:11:52 2009 New Revision: 57672 URL: http://svn.opensuse.org/viewcvs/yast?rev=57672&view=rev Log: - Adjusted ProductLicense to look for more license filename patterns (html, txt) (bnc #504803). 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=57672&r1=57671&r2=57672&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Mon Jun 22 11:11:52 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jun 22 11:10:09 CEST 2009 - lslezak@suse.cz + +- Adjusted ProductLicense to look for more license filename + patterns (html, txt) (bnc #504803). + +------------------------------------------------------------------- Thu May 14 15:49:48 CEST 2009 - lslezak@suse.cz - display the Configuration menu in the package selector Modified: trunk/packager/src/modules/ProductLicense.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/ProductLicense.ycp?rev=57672&r1=57671&r2=57672&view=diff ============================================================================== --- trunk/packager/src/modules/ProductLicense.ycp (original) +++ trunk/packager/src/modules/ProductLicense.ycp Mon Jun 22 11:11:52 2009 @@ -34,6 +34,13 @@ // list of already accepted licenses list <string> already_accepted_licenses = []; +list <string> license_patterns = [ + "license\\.html", "license\\.%1\\.html", + "license\\.htm", "license\\.%1\\.htm", + "license\\.txt", "license\\.%1\\.txt", + "license\\.*" +]; + /** * Creates a unique identification from filename * (MD5sum + file size) @@ -110,9 +117,9 @@ // License is HTML (or RichText) if (regexpmatch(license_text, "")) - rt = `MinWidth (80, - `RichText(`id (`welcome_text), license_text) - ); + rt = `MinWidth (80, `RichText(`id (`welcome_text), + license_text + )); // License is plain text // details in BNC #449188 else @@ -610,7 +617,7 @@ } licenses = LicenseFiles (license_dir, - ["license.txt", "license\\.%1\\.txt"]); + license_patterns); if (info_file == nil && size (licenses) == 0) return `auto; @@ -912,7 +919,7 @@ global symbol AskAddOnLicenseAgreement (integer src_id) { return AskLicenseAgreement (src_id, "", - [ "license\\.txt", "license\\.%1\\.txt" ], + license_patterns, "abort", // back button is disabled false, false, false); @@ -927,7 +934,7 @@ enable_back = false; return AskLicenseAgreement (nil, "", - [ "license\\.txt", "license\\.%1\\.txt" ], + license_patterns, action, // back button is enabled enable_back, true, true); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org