Skip to content

Commit c7dbf9e

Browse files
author
jantje
committed
#1410 uploads seem to work except for #1437
1 parent 610fe54 commit c7dbf9e

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

io.sloeber.core/src/io/sloeber/core/api/BoardDescription.java

+10-9
Original file line numberDiff line numberDiff line change
@@ -815,15 +815,6 @@ public Map<String, String> getEnvVars() {
815815
// put in the installed tools info
816816
allVars.putAll(getEnVarPlatformInfo());
817817

818-
Programmers localProgrammers[] = Programmers.fromBoards(this);
819-
String programmer = getProgrammer();
820-
for (Programmers curProgrammer : localProgrammers) {
821-
String programmerID = curProgrammer.getIDFromNiceName(programmer);
822-
if (programmerID != null) {
823-
allVars.putAll(curProgrammer.getAllEnvironVars(programmerID));
824-
}
825-
}
826-
827818
// boards settings not coming from menu selections
828819
allVars.putAll(myBoardTxtFile.getBoardEnvironVars(getBoardID()));
829820

@@ -838,6 +829,16 @@ public Map<String, String> getEnvVars() {
838829
allVars.putAll(curSelectedMenuItem.toKeyValues(EMPTY, false));
839830
}
840831

832+
//This moved last. See github issue 1410
833+
Programmers localProgrammers[] = Programmers.fromBoards(this);
834+
String programmer = getProgrammer();
835+
for (Programmers curProgrammer : localProgrammers) {
836+
String programmerID = curProgrammer.getIDFromNiceName(programmer);
837+
if (programmerID != null) {
838+
allVars.putAll(curProgrammer.getAllEnvironVars(programmerID));
839+
}
840+
}
841+
841842
// add the stuff that comes with the plugin that is marked as post
842843
allVars.putAll(pluginPostProcessingPlatformTxt.getAllEnvironVars(EMPTY));
843844
allVars.putAll(pluginPostProcessingBoardsTxt.getBoardEnvironVars(getBoardID()));

0 commit comments

Comments
 (0)