diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-08-30 23:25:29 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-30 23:25:29 -0700 |
| commit | 0305f228d2ac9dc63ec34c1098f827f37b891923 (patch) | |
| tree | d67f7c00f1d1eb86aae6c29193bbd42410f18919 /pym/_emerge/actions.py | |
| parent | b22dda3577107af572453ce0058dfc18c22471a5 (diff) | |
| download | portage-0305f228d2ac9dc63ec34c1098f827f37b891923.tar.gz portage-0305f228d2ac9dc63ec34c1098f827f37b891923.tar.bz2 portage-0305f228d2ac9dc63ec34c1098f827f37b891923.zip | |
Show PORTAGE_BZIP2_COMMAND and PORTAGE_BUNZIP2_COMMAND in emerge --info,
in case it triggers mysterious unpack() issues or something.
Diffstat (limited to 'pym/_emerge/actions.py')
| -rw-r--r-- | pym/_emerge/actions.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 683d79b87..d84e434d6 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -1336,12 +1336,18 @@ def action_info(settings, trees, myopts, myfiles): else: myvars = ['GENTOO_MIRRORS', 'CONFIG_PROTECT', 'CONFIG_PROTECT_MASK', 'PORTDIR', 'DISTDIR', 'PKGDIR', 'PORTAGE_TMPDIR', - 'PORTDIR_OVERLAY', 'USE', 'CHOST', 'CFLAGS', 'CXXFLAGS', + 'PORTDIR_OVERLAY', 'PORTAGE_BUNZIP2_COMMAND', + 'PORTAGE_BZIP2_COMMAND', + 'USE', 'CHOST', 'CFLAGS', 'CXXFLAGS', 'ACCEPT_KEYWORDS', 'ACCEPT_LICENSE', 'SYNC', 'FEATURES', 'EMERGE_DEFAULT_OPTS'] myvars.extend(portage.util.grabfile(settings["PORTDIR"]+"/profiles/info_vars")) + myvars_ignore_defaults = { + 'PORTAGE_BZIP2_COMMAND' : 'bzip2', + } + myvars = portage.util.unique_array(myvars) use_expand = settings.get('USE_EXPAND', '').split() use_expand.sort() @@ -1354,6 +1360,10 @@ def action_info(settings, trees, myopts, myfiles): for x in myvars: if x in settings: if x != "USE": + default = myvars_ignore_defaults.get(x) + if default is not None and \ + default == settings[x]: + continue writemsg_stdout('%s="%s"\n' % (x, settings[x]), noiselevel=-1) else: use = set(settings["USE"].split()) |