Skip to content

Commit 232d8ff

Browse files
pipcl.py: show_system(): don't print environ if PIPCL_SHOW_ENV=0.
1 parent 87813c3 commit 232d8ff

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

pipcl.py

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2416,6 +2416,8 @@ def openbsd():
24162416
def show_system():
24172417
'''
24182418
Show useful information about the system plus argv and environ.
2419+
2420+
Omits os.environ if $PIPCL_SHOW_ENV is '0'.
24192421
'''
24202422
def log(text):
24212423
log0(text, caller=3)
@@ -2447,14 +2449,18 @@ def log(text):
24472449
for i, arg in enumerate(sys.argv):
24482450
log(f' {i}: {arg!r}')
24492451

2450-
log(f'os.environ ({len(os.environ)}):')
2451-
for k in sorted( os.environ.keys()):
2452-
v = os.environ[ k]
2453-
if 'BEGIN OPENSSH PRIVATE KEY' in v:
2454-
# Don't show private keys.
2455-
log(f' {k} ****')
2456-
else:
2457-
log( f' {k}: {v!r}')
2452+
PIPCL_SHOW_ENV = os.environ.get('PIPCL_SHOW_ENV')
2453+
if PIPCL_SHOW_ENV == '0':
2454+
log(f'[Not showing os.environ because {PIPCL_SHOW_ENV=}.]')
2455+
else:
2456+
log(f'os.environ ({len(os.environ)}):')
2457+
for k in sorted( os.environ.keys()):
2458+
v = os.environ[ k]
2459+
if 'BEGIN OPENSSH PRIVATE KEY' in v:
2460+
# Don't show private keys.
2461+
log(f' {k} ****')
2462+
else:
2463+
log( f' {k}: {v!r}')
24582464

24592465

24602466
class PythonFlags:

0 commit comments

Comments
 (0)