Fix installation of new version of the ditributives.

Fix detect march.
Fix detect os_install_linux_ver.
netsetup
Mike Hiretsky 14 years ago
parent a4fc927cc7
commit 2f6fd49aa5

@ -142,10 +142,11 @@ class DistributiveRepository:
extname = "dir" extname = "dir"
d = self.ini_to_dict(path.join(filename, d = self.ini_to_dict(path.join(filename,
'etc/calculate/calculate.ini')) 'etc/calculate/calculate.ini'))
if d and path.exists(path.join(filename,'lib64')): if not d or not "march" in d:
d['march'] = 'x86_64' if path.exists(path.join(filename,'lib64')):
else: d['march'] = 'x86_64'
d['march']= 'i686' else:
d['march']= 'i686'
if d: if d:
d['ext'] = extname d['ext'] = extname
d["name"] = varsShare.getShortnameByMakeprofile(filename) or \ d["name"] = varsShare.getShortnameByMakeprofile(filename) or \

@ -567,6 +567,8 @@ class fillVars(object, glob_attr):
d = DistributiveRepository()._getdistrinfo(imagename) d = DistributiveRepository()._getdistrinfo(imagename)
if "linuxver" in d: if "linuxver" in d:
return d['linuxver'] return d['linuxver']
if "ver" in d:
return d['ver']
else: else:
if self.Get('os_install_linux_shortname') == \ if self.Get('os_install_linux_shortname') == \
self.Get('os_linux_shortname'): self.Get('os_linux_shortname'):

@ -764,10 +764,6 @@ class otherfilesCopy(scanDirectory):
{'src':pathname,'dst':pathJoin(self.target,pathname)}) {'src':pathname,'dst':pathJoin(self.target,pathname)})
return True return True
class cl_install(color_print, SignalInterrupt): class cl_install(color_print, SignalInterrupt):
"""Primary class for templates appling and system installation""" """Primary class for templates appling and system installation"""

Loading…
Cancel
Save