Merge 5822a60 into 70a3ce9

payu/models/model.py

@@ -281,13 +281,16 @@ def setup(self):
 
         # Make symlink to executable in work directory
         if self.exec_path:
-            # Add to exe manifest (this is always done so any change in exe
-            # path will be picked up)
-            self.expt.manifest.add_filepath(
-                'exe',
-                self.exec_path_local,
-                self.exec_path
-            )
+            # If have exe manifest this implies exe reproduce is True. Do not
+            # want to overwrite exe manifest in this case
+            if not self.expt.manifest.have_manifest['exe']:
+                # Add to exe manifest (this is always done so any change in exe
+                # path will be picked up)
+                self.expt.manifest.add_filepath(
+                    'exe',
+                    self.exec_path_local,
+                    self.exec_path
+                )
 
         timestep = self.config.get('timestep')
         if timestep:

test/test_manifest.py

@@ -213,6 +213,24 @@ def test_exe_reproduce():
     # Check manifests have changed as expected
     assert(not manifests == get_manifests(ctrldir/'manifests'))
 
+    # Reset manifests "truth"
+    manifests = get_manifests(ctrldir/'manifests')
+
+    # Make exe in config.yaml unfindable by giving it a non-existent
+    # path but crucially the same name as the proper executable
+    config['exe'] = '/bogus/test.exe'
+
+    # Change reproduce exe back to True
+    config['manifest']['reproduce']['exe'] = True
+
+    write_config(config)
+
+    # Run setup with changed exe but reproduce exe set to True. Should
+    # work fine as the exe path is in the manifest
+    payu_setup(lab_path=str(labdir))
+
+    assert(manifests == get_manifests(ctrldir/'manifests'))
+
 
 def test_input_reproduce():
 
@@ -222,6 +240,7 @@ def test_input_reproduce():
     # Set reproduce input to True
     config['manifest']['reproduce']['exe'] = False
     config['manifest']['reproduce']['input'] = True
+    config['exe'] = config_orig['exe']
     write_config(config)
     manifests = get_manifests(ctrldir/'manifests')