Skip to content

Commit

Permalink
Merge pull request #4598 from ekluzek/fixundefmachine
Browse files Browse the repository at this point in the history
Fix undefined machine on cime6.0.217_httpsbranch branch

Initialize machine to None to prevent not initializing it to anything. This is cherry-picked
from #4596

Testing: Run CTSM python testing (which was failing before this change)
./scripts_regression_tests.py (currently running)
Test status: bit-for-bit

Fix for #4588 on the httpsbranch branch.

This fixes issues in CTSM discussed here:

ESCOMP/CTSM#2385 (comment)

User interface changes?: None

Update gh-pages html (Y/N)?: N
  • Loading branch information
billsacks authored Mar 12, 2024
2 parents 496da7c + 3f6a586 commit cf099fb
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions CIME/XML/machines.py
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,7 @@ def _probe_machine_name_one_guess_v3(self, nametomatch):

children = [y for x in nodes for y in self.get_children(root=x)]

machine = None
for child in children:
machtocheck = self.get(child, "MACH")
regex_str = self.text(child)
Expand Down

0 comments on commit cf099fb

Please sign in to comment.