Merge branch 'master' of git.calculate.ru:/calculate-lib

develop
Самоукин Алексей 14 years ago
commit deef45c718

@ -279,6 +279,7 @@ class fillVars(glob_attr):
"CLDX":"Calculate Linux Desktop", "CLDX":"Calculate Linux Desktop",
"CLDG":"Calculate Linux Desktop", "CLDG":"Calculate Linux Desktop",
"CDS":"Calculate Directory Server", "CDS":"Calculate Directory Server",
"CSS":"Calculate Scratch Server",
"Gentoo":"Gentoo"} "Gentoo":"Gentoo"}
if linuxShortName in dictLinuxName.keys(): if linuxShortName in dictLinuxName.keys():
return dictLinuxName[linuxShortName] return dictLinuxName[linuxShortName]
@ -708,4 +709,4 @@ class fillVars(glob_attr):
homeDir = pwd.getpwnam(userName).pw_dir homeDir = pwd.getpwnam(userName).pw_dir
except: except:
return "" return ""
return homeDir return homeDir

Loading…
Cancel
Save