fix autocompile for pythia8

Author: WolfgangWaltenberger

smodels/tools/pythia8Wrapper.py

@@ -122,18 +122,19 @@ def checkInstallation ( self, compile : bool = True ):
         exists = os.path.exists ( self.includeFile )
         xmldoc = self.getXmldoc()
         sleep = 0.
-        while not os.path.exists ( xmldoc ): # if this disappears, start from scratch
+        while not os.path.exists ( xmldoc ) or not os.path.exists ( self.executablePath ): # if this disappears, start from scratch
             import time
             sleep += .5
             time.sleep ( sleep )
-            if sleep > .5 and not os.path.exists ( xmldoc ): 
+            if sleep > .5 and not os.path.exists ( xmldoc ) or not os.path.exists ( self.executablePath ):
                 if compile:
                     # after a few seconds, delete, if compile is true
                     import shutil
                     p = xmldoc.find ( "share" )
                     rm = xmldoc[:p-1]
                     if False:
                         shutil.rmtree ( rm, ignore_errors = True )
+                    self.compile()
                 exists = False
                 break
 
@@ -148,12 +149,12 @@ def checkInstallation ( self, compile : bool = True ):
 
     def getXmldoc ( self ):
         """ get the content of xml.doc """
-        xmldoc = self.executablePath.replace("pythia8.exe", "xml.doc")
-        logger.debug("exe path=%s" % self.executablePath)
+        xmldoc = self.executablePath.replace( "pythia8.exe", "xml.doc" )
+        logger.debug( f"exe path={self.executablePath}" )
         if not os.path.exists ( xmldoc ):
             return None
         if os.path.exists(xmldoc):
-            logger.debug("xml.doc found at %s." % xmldoc)
+            logger.debug(f"xml.doc found at {xmldoc}.")
             with open(xmldoc) as f:
                 xmlDir = f.read()
                 toadd = os.path.join(os.path.dirname(xmldoc), xmlDir.strip())

smodels/tools/wrapperBase.py

@@ -66,23 +66,23 @@ def chmod(self):
         os.chmod ( self.executablePath, mode )
         return True
 
-    def compile(self):
+    def compile ( self ):
         """
         Try to compile the tool.
         """
         if not self.maycompile:
             logger.error("Asking to compile, but auto-compilation turned off for %s", self.name )
             return
-        logger.debug("Trying to compile %s", self.name)
-        cmd = "cd %s; make" % self.srcPath
+        logger.info( f"Trying to compile {self.name}" )
+        cmd = f"cd {self.srcPath}; make"
         out = executor.getoutput(cmd)
         # out = subprocess.check_output ( cmd, shell=True, universal_newlines=True )
         logger.debug(out)
         if not os.path.exists ( self.executablePath ):
             if self.maycompile: ## should have worked
-                logger.error ( "Compilation of %s failed. Is the %s compiler installed?" % ( self.name, self.compiler ) )
+                logger.error ( f"Compilation of {self.name} failed. Is the {self.compiler} compiler installed?" )
             sys.exit()
-        logger.info ( "Compilation of %s succeeded!" % ( self.name ) )
+        logger.info ( f"Compilation of {self.name} succeeded!" )
         return True
 
 
@@ -96,10 +96,10 @@ def checkInstallation(self, compile=True ):
         """
         if not os.path.exists(self.executablePath):
             if compile:
-                logger.warning("%s executable not found. Trying to compile it now. This may take a while." % self.name )
+                logger.warning( f"{self.name} executable not found. Trying to compile it now. This may take a while." )
                 self.compile()
             else:
-                logger.warning("%s executable not found." % self.name )
+                logger.warning( f"{self.name} executable not found." )
                 self.complain()
                 return False
         if not os.path.exists(self.executablePath):