Effort to tackle https://issues.jenkins-ci.org/browse/JENKINS-26059 t…

…o expand var during conditional
jenkinsci · Dec 15, 2014 · 51c211e · 51c211e
1 parent d5e5298
commit 51c211e
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/main/java/hockeyapp/HockeyappRecorder.java b/src/main/java/hockeyapp/HockeyappRecorder.java
@@ -207,13 +207,12 @@ private boolean performForApplication(AbstractBuild<?, ?> build, Launcher launch
 
                 if (application.releaseNotesMethod != null) {
                     createReleaseNotes(build, entity, listener, tempDir, vars, application);
-
                 }
 
 
                 entity.addPart("ipa", fileBody);
 
-                if (application.dsymPath != null) {
+                if (vars.expand(application.dsymPath) != null) {
                     FilePath remoteDsymFiles[] = remoteWorkspace.list(vars.expand(application.dsymPath));
                     // Take the first one that matches the pattern
                     if (remoteDsymFiles.length == 0) {
@@ -226,7 +225,7 @@ private boolean performForApplication(AbstractBuild<?, ?> build, Launcher launch
                     entity.addPart("dsym", dsymFileBody);
                 }
 
-                if (application.libsPath != null) {
+                if (vars.expand(application.libsPath) != null) {
                     FilePath remoteLibsFiles[] = remoteWorkspace.list(vars.expand(application.libsPath));
                     // Take the first one that matches the pattern
                     if (remoteLibsFiles.length == 0) {
@@ -239,7 +238,7 @@ private boolean performForApplication(AbstractBuild<?, ?> build, Launcher launch
                     entity.addPart("libs", libsFileBody);
                 }
 
-                if (application.tags != null && application.tags.length() > 0)
+                if (vars.expand(application.tags) != null && application.tags.length() > 0)
                     entity.addPart("tags", new StringBody(vars.expand(application.tags)));
                 entity.addPart("notify", new StringBody(application.notifyTeam ? "1" : "0"));
                 entity.addPart("status",