Fix checkutils

calculate/lib/utils/files.py

@@ -21,6 +21,7 @@ from subprocess import Popen,PIPE,STDOUT
 import stat
 from shutil import copytree, rmtree
 from calculate.lib import cl_overriding
+from calculate.lib.datavars import VariableError
 import re
 import sys
 from itertools import *
@@ -610,9 +611,8 @@ def checkUtils(*utils):
     for util in utils:
         utilPath = getProgPath(util)
         if not utilPath:
-            cl_overriding.printERROR(_("Command not found '%s'")%
+            raise VariableError(_("Command not found '%s'")%
                                      path.basename(util))
-            cl_overriding.exit(1)
         retval.append(utilPath)
     if len(retval) == 1:
         return retval[0]

calculate/lib/variables/X11.py

@@ -23,7 +23,7 @@ from calculate.lib.utils.common import (getAvailableVideo, getValueFromCmdLine,
                 getVideoFromXorgLog, getVideoFromXorgConf, getVideoFromCmdLine,
                 getCompositeFromXorgconf,
                 getVideoFromModules, getVideoFromVendor,getInstalledVideo)
-from calculate.lib.utils.common import isPkgInstalled
+from calculate.lib.utils.portage import isPkgInstalled
 from math import sqrt
 
 class VariableOsX11Resolution(Variable):