|
|
|
@ -27,19 +27,11 @@ class fillVars(object, cl_base.glob_attr):
|
|
|
|
|
'/var/calculate/remote/client-profile/%s'%osLinuxName,
|
|
|
|
|
'/var/calculate/client-profile/%s'%osLinuxName]
|
|
|
|
|
for profPath in profPaths:
|
|
|
|
|
if os.path.exists(profPath):
|
|
|
|
|
if os.path.isdir(profPath):
|
|
|
|
|
paths = os.listdir(profPath)
|
|
|
|
|
pathAlways = []
|
|
|
|
|
pathPriority = []
|
|
|
|
|
for path in paths:
|
|
|
|
|
if os.path.split(path)[1] == "always":
|
|
|
|
|
pathAlways.append(path)
|
|
|
|
|
else:
|
|
|
|
|
pathPriority.append(path)
|
|
|
|
|
paths = pathPriority + pathAlways
|
|
|
|
|
for path in paths:
|
|
|
|
|
ph = os.path.join(profPath,path)
|
|
|
|
|
if os.path.exists(ph) and os.listdir(ph):
|
|
|
|
|
if os.path.isdir(ph) and os.listdir(ph):
|
|
|
|
|
profpath.append(ph)
|
|
|
|
|
return profpath
|
|
|
|
|
|
|
|
|
|