trivial style fixes

Author: boegel

easybuild/framework/easyblock.py

@@ -1794,13 +1794,12 @@ def set_parallel(self):
         cfg_par = self.cfg['parallel']
         if cfg_par is None:
             self.log.debug("Desired parallelism specified via 'parallel' build option: %s", par)
+        elif par is None:
+            par = cfg_par
+            self.log.debug("Desired parallelism specified via 'parallel' easyconfig parameter: %s", par)
         else:
-            if par is None:
-                par = cfg_par
-                self.log.debug("Desired parallelism specified via 'parallel' easyconfig parameter: %s", par)
-            else:
-                par = min(int(par), int(cfg_par))
-                self.log.debug("Desired parallelism: minimum of 'parallel' build option/easyconfig parameter: %s", par)
+            par = min(int(par), int(cfg_par))
+            self.log.debug("Desired parallelism: minimum of 'parallel' build option/easyconfig parameter: %s", par)
 
         par = det_parallelism(par, maxpar=self.cfg['maxparallel'])
         self.log.info("Setting parallelism: %s" % par)

easybuild/tools/systemtools.py

@@ -996,7 +996,7 @@ def get_default_parallelism():
             par_guess = (maxuserproc - 15) // 6
             if par_guess < par:
                 par = par_guess
-                _log.info("Limit parallel builds to %s because max user processes is %s" % (par, out))
+                _log.info("Limit parallel builds to %s because max user processes is %s", par, out)
             # Cache value
             det_parallelism._default_parallelism = par
         return par
@@ -1010,7 +1010,7 @@ def get_default_parallelism():
             raise EasyBuildError("Specified level of parallelism '%s' is not an integer value: %s", par, err)
 
     if maxpar is not None and maxpar < par:
-        _log.info("Limiting parallellism from %s to %s" % (par, maxpar))
+        _log.info("Limiting parallellism from %s to %s", par, maxpar)
         par = maxpar
 
     return par