|
|
|
@ -328,7 +328,7 @@ class cl_builder(color_print):
|
|
|
|
|
createdDev = self.createUrandom(mp)
|
|
|
|
|
self.dispatchConf(mp)
|
|
|
|
|
self.updatePortage(mp)
|
|
|
|
|
self.clearPortage(mp)
|
|
|
|
|
#self.clearPortage(mp)
|
|
|
|
|
self.updateMan(mp)
|
|
|
|
|
self.removeUrandom(mp,createdDev)
|
|
|
|
|
|
|
|
|
@ -578,8 +578,12 @@ class cl_builder(color_print):
|
|
|
|
|
"""Get list for portage exclude by 'cl_builder_tree'"""
|
|
|
|
|
if self.clVars.Get('cl_builder_tree') == 'off':
|
|
|
|
|
portagePath = pathJoin(sourceDirectory,"usr/portage")
|
|
|
|
|
return map(lambda x: path.join("usr/portage",x),
|
|
|
|
|
filter(lambda x: not x in ( "eclass", "licenses", "profiles"),
|
|
|
|
|
overlayPath = pathJoin(sourceDirectory,"var/lib/layman/calculate")
|
|
|
|
|
return map(lambda x: path.join("var/lib/layman/calculate",x),
|
|
|
|
|
filter(lambda x: not x in ("distfiles", "eclass", ".git","profiles"),
|
|
|
|
|
listDirectory(overlayPath))) + \
|
|
|
|
|
map(lambda x: path.join("usr/portage",x),
|
|
|
|
|
filter(lambda x: not x in ("distfiles", "eclass", ".git","profiles"),
|
|
|
|
|
listDirectory(portagePath)))
|
|
|
|
|
else:
|
|
|
|
|
return []
|
|
|
|
|