[matter] make Entropy colorized output settings affect Portage as well
This commit is contained in:
@@ -25,7 +25,7 @@ from entropy.exceptions import PermissionDenied
|
||||
from entropy.const import etpConst, etpUi, const_convert_to_unicode, \
|
||||
const_get_stringtype
|
||||
from entropy.output import print_info, print_error, print_warning, \
|
||||
purple, darkgreen, is_stdout_a_tty
|
||||
purple, darkgreen, is_stdout_a_tty, getcolor
|
||||
from entropy.exceptions import InvalidAtom, SPMError
|
||||
from entropy.server.interfaces import Server
|
||||
|
||||
@@ -746,6 +746,7 @@ class PackageBuilder(object):
|
||||
NOTE: negative errors indicate warnings that can be skipped.
|
||||
"""
|
||||
os.environ['ACCEPT_PROPERTIES'] = "* -interactive"
|
||||
|
||||
from _emerge.depgraph import backtrack_depgraph
|
||||
from _emerge.actions import load_emerge_config, action_build
|
||||
from _emerge.create_depgraph_params import create_depgraph_params
|
||||
@@ -825,6 +826,9 @@ class PackageBuilder(object):
|
||||
emerge_settings, emerge_trees, mtimedb = \
|
||||
load_emerge_config(trees=portage.db)
|
||||
|
||||
if not getcolor():
|
||||
portage.output.nocolor()
|
||||
|
||||
# non interactive properties, this is not really required
|
||||
# accept-properties just sets os.environ...
|
||||
builtin_args = ["--accept-properties=-interactive"]
|
||||
@@ -845,6 +849,8 @@ class PackageBuilder(object):
|
||||
if emerge_settings.get("TERM") == "dumb" or not is_stdout_a_tty():
|
||||
spinner.update = spinner.update_basic
|
||||
|
||||
print_info("emerge args: %s" % (" ".join(sorted(myopts.keys())),))
|
||||
|
||||
params = create_depgraph_params(myopts, myaction)
|
||||
success, graph, favorites = backtrack_depgraph(emerge_settings,
|
||||
emerge_trees, myopts, params, myaction, myfiles, spinner)
|
||||
|
||||
Reference in New Issue
Block a user