Merge pull request #4711 from jedwards4b/fix_rpointer_doesnt_exist

make sure file exists before assigning
ESMCI · Dec 5, 2024 · 902dc84 · 902dc84
2 parents f285060 + 86cb6d1
commit 902dc84
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/CIME/case/case_run.py b/CIME/case/case_run.py
@@ -502,8 +502,9 @@ def case_run(self, skip_pnl=False, set_continue_run=False, submit_resubmits=Fals
         if drv_restart_pointer:
             pattern = os.path.join(rundir, "rpointer.cpl*")
             files = sorted(glob.glob(pattern), key=os.path.getmtime)
-            drv_ptr = os.path.basename(files[-1])
-            self.set_value("DRV_RESTART_POINTER", drv_ptr)
+            if files:
+                drv_ptr = os.path.basename(files[-1])
+                self.set_value("DRV_RESTART_POINTER", drv_ptr)
         model_log(
             "e3sm",
             logger,

diff --git a/CIME/non_py/cprnc b/CIME/non_py/cprnc
diff --git a/CIME/wait_for_tests.py b/CIME/wait_for_tests.py
@@ -3,7 +3,6 @@
 import os, time, threading, socket, signal, shutil, glob
 
 # pylint: disable=import-error
-from distutils.spawn import find_executable
 import logging
 import xml.etree.ElementTree as xmlet
 
@@ -516,7 +515,7 @@ def create_cdash_xml(
             hostname,
             cdash_build_name,
             cdash_project,
-            find_executable("scp"),
+            shutil.which("scp"),
             cdash_timestamp,
             drop_method,
         )
+7 −19		CMakeLists.txt
+0 −96		cmake/FindNetCDF.cmake
+0 −143		cmake/FindNetCDF.cmake~
+0 −104		cmake/LibCheck.cmake
+0 −330		cmake/LibFind.cmake