Mailinglist Archive: yast-commit (1914 mails)

< Previous Next >
[yast-commit] r58595 - /trunk/packager/src/modules/ProductLicense.ycp
  • From: kmachalkova@xxxxxxxxxxxxxxxx
  • Date: Wed, 09 Sep 2009 11:25:13 -0000
  • Message-id: <E1MlLIX-0000Tf-BH@xxxxxxxxxxxxxxxx>
Author: kmachalkova
Date: Wed Sep 9 13:25:12 2009
New Revision: 58595

URL: http://svn.opensuse.org/viewcvs/yast?rev=58595&view=rev
Log:
Fixed regexp patterns (missing $), match a pattern
instead of == string comparison - bnc#533026

Modified:
trunk/packager/src/modules/ProductLicense.ycp

Modified: trunk/packager/src/modules/ProductLicense.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/ProductLicense.ycp?rev=58595&r1=58594&r2=58595&view=diff
==============================================================================
--- trunk/packager/src/modules/ProductLicense.ycp (original)
+++ trunk/packager/src/modules/ProductLicense.ycp Wed Sep 9 13:25:12 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@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages