[FIXED JENKINS-37416] Expand local manifest value

Apply the variable expansion added in fc2c8d1 also to the local manifest.
jenkinsci · Aug 15, 2016 · e8dc112 · e8dc112
1 parent 1c38924
commit e8dc112
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/main/java/hudson/plugins/repo/RepoScm.java b/src/main/java/hudson/plugins/repo/RepoScm.java
@@ -814,10 +814,11 @@ private boolean checkoutCode(final Launcher launcher,
 			FilePath lm = rdir.child("local_manifest.xml");
 			lm.delete();
 			if (localManifest != null) {
-				if (localManifest.startsWith("<?xml")) {
-					lm.write(localManifest, null);
+				String expandedLocalManifest = env.expand(localManifest);
+				if (expandedLocalManifest.startsWith("<?xml")) {
+					lm.write(expandedLocalManifest, null);
 				} else {
-					URL url = new URL(localManifest);
+					URL url = new URL(expandedLocalManifest);
 					lm.copyFrom(url);
 				}
 			}