Author: kmachalkova Date: Wed Sep 9 16:52:09 2009 New Revision: 58606 URL: http://svn.opensuse.org/viewcvs/yast?rev=58606&view=rev Log: Use correct regexp patterns, match regexps instead of string comparision - bnc#533026 Modified: branches/SuSE-Code-11-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-Branch/packager/src/modules/ProductLicense.ycp Modified: branches/SuSE-Code-11-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/packager/package/yast2-packager.changes?rev=58606&r1=58605&r2=58606&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-Branch/packager/package/yast2-packager.changes Wed Sep 9 16:52:09 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Sep 9 16:47:20 CEST 2009 - kmachalkova@suse.cz + +- Correct regexp evaluation in searching for suitable file with + license agreement (bnc#533026, regression from bnc#504803) + +------------------------------------------------------------------- Tue Jul 7 14:13:14 CEST 2009 - lslezak@suse.cz - use URL.ycp for processing smb:// URLs (bnc#495109) Modified: branches/SuSE-Code-11-Branch/packager/src/modules/ProductLicense.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/packager/src/modules/ProductLicense.ycp?rev=58606&r1=58605&r2=58606&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/packager/src/modules/ProductLicense.ycp (original) +++ branches/SuSE-Code-11-Branch/packager/src/modules/ProductLicense.ycp Wed Sep 9 16:52:09 2009 @@ -38,7 +38,7 @@ "license\\.html", "license\\.%1\\.html", "license\\.htm", "license\\.%1\\.htm", "license\\.txt", "license\\.%1\\.txt", - "license\\.*" + "license\\.*$", "license\\.%1\\.*$" ]; /** @@ -369,7 +369,10 @@ if (! issubstring (p, "%")) { foreach (string file, files, { - if (file == p) + //Possible license file names are regexp patterns + //(see list <string> license_patterns) + //so we should treat them as such (bnc#533026) + if ( regexpmatch(file,p) ) { ret[""] = dir + "/" + file; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org