Log Message
Expand env. variables
Modified Paths
Diff
Modified: trunk/hudson/plugins/imagecomparison/src/main/java/org/jenkinsci/plugins/imagecomparison/ImageComparator.java (41333 => 41334)
--- trunk/hudson/plugins/imagecomparison/src/main/java/org/jenkinsci/plugins/imagecomparison/ImageComparator.java 2015-05-16 22:27:30 UTC (rev 41333)
+++ trunk/hudson/plugins/imagecomparison/src/main/java/org/jenkinsci/plugins/imagecomparison/ImageComparator.java 2015-05-16 22:35:40 UTC (rev 41334)
@@ -26,6 +26,7 @@
import hudson.Extension;
import hudson.Launcher;
+import hudson.Util;
import hudson.model.BuildListener;
import hudson.model.AbstractBuild;
import hudson.model.AbstractProject;
@@ -88,8 +89,11 @@
}
public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException {
- File f1 = new File(image1);
- File f2 = new File(image2);
+ String image1Replaced = Util.replaceMacro(image1 ,build.getEnvironment(listener));
+ String image2Replaced = Util.replaceMacro(image2, build.getEnvironment(listener));
+ File f1 = new File(image1Replaced);
+ File f2 = new File(image2Replaced);
+
if(!f1.isFile() || !f1.canRead())
{
listener.error("Can't access " + f1.getAbsolutePath() + "!\n");
You received this message because you are subscribed to the Google Groups "Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-commits+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
