mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-16 05:22:22 +00:00
[FIXED HUDSON-7611] Make sure the changelog paths we're comparing against are using Unix slashes, same as the module paths
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@35382 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
1 parent
a163996a9c
commit
c8e932f2d8
1 file changed
+2
-2
@@ -165,7 +165,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
|
||||
|
||||
private boolean belongsToSubsidiary(List<MavenModule> subsidiaries, String path) {
|
||||
for (MavenModule sub : subsidiaries)
|
||||
if(path.startsWith(FilenameUtils.normalize(sub.getRelativePath())))
|
||||
if (FilenameUtils.separatorsToUnix(path).startsWith(FilenameUtils.normalize(sub.getRelativePath())))
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
@@ -175,7 +175,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
|
||||
*/
|
||||
private boolean isDescendantOf(ChangeLogSet.Entry e, MavenModule mod) {
|
||||
for (String path : e.getAffectedPaths()) {
|
||||
if(path.startsWith(FilenameUtils.normalize(mod.getRelativePath())))
|
||||
if (FilenameUtils.separatorsToUnix(path).startsWith(FilenameUtils.normalize(mod.getRelativePath())))
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
||||
Reference in new issue
Block a user