Migrate to calculate.env

calculate/lib/variables/env.py

@@ -26,9 +26,9 @@ from calculate.lib.utils.files import listDirectory,process,PIPE
 from calculate.lib.cl_lang import setLocalTranslate
 setLocalTranslate('cl_lib3',sys.modules[__name__])
 
-_envData = [('system', '/etc/calculate/calculate3.env'),
-             ('local', '/var/calculate/calculate3.env'),
-             ('remote', '/var/calculate/remote/calculate3.env')]
+_envData = [('system', '/etc/calculate/calculate.env'),
+             ('local', '/var/calculate/calculate.env'),
+             ('remote', '/var/calculate/remote/calculate.env')]
 
 class VariableClEnvData(TableVariable):
     """
@@ -169,12 +169,6 @@ class VariableClMerges(Variable):
     type = 'list'
 
     def get(self):
-        try:
-            config = cl_template.iniParser('/etc/calculate/calculate2.env')
-            val = config.getVar('main','cl_merges')
-            return val.encode('utf-8').split(',')
-        except:
-            pass
         return []
 
     def set(self,value):
@@ -187,15 +181,6 @@ class VariableClAutoupdateSet(Variable):
     type = 'boolean'
     value = 'off'
 
-    def get(self):
-        try:
-            config = cl_template.iniParser('/etc/calculate/calculate2.env')
-            val = config.getVar('main','cl_autoupdate_set')
-            return val.encode('utf-8')
-        except:
-            pass
-        return []
-
 class VariableClWsdl(Variable):
     """
     Packages with wsdl

calculate/lib/variables/linux.py

@@ -228,6 +228,8 @@ class LinuxDataVars(SimpleDataVars):
             VariableOsLinuxSystem(),
             VariableOsLinuxVer(systemRoot=systemRoot),
             VariableOsLinuxBuild(systemRoot=systemRoot))
+        iniFile = "etc/calculate/calculate.env"
+        self.flIniFileFrom(path.join(systemRoot,iniFile))
         iniFile = "etc/calculate/calculate3.env"
         self.flIniFileFrom(path.join(systemRoot,iniFile))
         iniFile = "etc/calculate/calculate2.env"