commit 6328602a346e34fb9bf9a65a6e86adda5b25a6d7
author Rob Mohr <mohrr@google.com> Wed Jul 08 07:52:38 2020 -0700
committer CQ Bot Account <commit-bot@chromium.org> Wed Jul 08 16:53:01 2020 +0000
tree e6e5cd945e0bcd05be19e49fa89a4bf63d70d50b
parent a61b43b9d7e6a0ffea34ac9ac5e12f42a713adba

pw_env_setup: add username to CIPD ACL errors

Change-Id: Ia9d9ac396feae4f533f629aa3e7c76b4f3a8c736
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/13460
Reviewed-by: Paul Mathieu <paulmathieu@google.com>
Commit-Queue: Rob Mohr <mohrr@google.com>

pw_env_setup/py/pw_env_setup/cipd_setup/update.py

diff --git a/pw_env_setup/py/pw_env_setup/cipd_setup/update.py b/pw_env_setup/py/pw_env_setup/cipd_setup/update.py
index 3196662..391512c 100755
--- a/pw_env_setup/py/pw_env_setup/cipd_setup/update.py
+++ b/pw_env_setup/py/pw_env_setup/cipd_setup/update.py
@@ -24,6 +24,7 @@
 import argparse
 import json
 import os
+import re
 import shutil
 import subprocess
 import sys
@@ -77,8 +78,15 @@
                 paths.append('/'.join(parts))
 
     try:
-        subprocess.check_output([cipd, 'auth-info'], stderr=subprocess.STDOUT)
+        output = subprocess.check_output([cipd, 'auth-info'],
+                                         stderr=subprocess.STDOUT).decode()
         logged_in = True
+
+        username = None
+        match = re.search(r'Logged in as (\S*)\.', output)
+        if match:
+            username = match.group(1)
+
     except subprocess.CalledProcessError:
         logged_in = False
 
@@ -93,7 +101,11 @@
             stderr('=' * 60)
             stderr('ERROR: no access to CIPD path "{}"'.format(path))
             if logged_in:
-                stderr('Your account does not have access to this path')
+                username_part = ''
+                if username:
+                    username_part = '({}) '.format(username)
+                stderr('Your account {}does not have access to this '
+                       'path'.format(username_part))
             else:
                 stderr('Try logging in with this command:')
                 stderr()