Another round of fixing logic, LOG.info() that we are using binary directly

Author: willend

tools/Python/mcrun/mccode.py

@@ -128,20 +128,21 @@ def x_path(file):
             ''' Return external path (relative to self.path) for file '''
             return '%s/%s' % (dirname(self.path), basename(file))
 
-        # Copy instrument file to cwd if not already there (for compatibility)
-        if not isfile(basename(self.path)):
-            shutil.copy2(self.path, ".")  # also copies stat information
-
         # Create the path for the binary
         if os.name == 'nt':
             self.binpath = '%s.%s' % (self.name, mccode_config.platform['EXESUFFIX'])
         else:
             self.binpath = './%s.%s' % (self.name, mccode_config.platform['EXESUFFIX'])
 
         # Check if self.path is .exe or .out binary, if so - skip ahead to execution
-        if pathlib.Path(self.path).suffix==mccode_config.platform['EXESUFFIX']:
+        if self.path==basename(self.binpath):
+            LOG.info('Called with binary file %s, skipping ahead to execution', self.binpath)
             return
 
+        # Copy instrument file to cwd if not already there (for compatibility)
+        if not isfile(basename(self.path)):
+            shutil.copy2(self.path, ".")  # also copies stat information
+        
         # Check if c-code should be regenerated by comparing to instr timestamp
         existingC = findReusableFile(self.path,
                                      [self.cpath, x_path(self.cpath)])