diff options
| author | Erwin Jansen <jansene@google.com> | 2022-09-16 11:00:32 -0700 |
|---|---|---|
| committer | Erwin Jansen <jansene@google.com> | 2022-09-16 18:14:10 +0000 |
| commit | ce55aca44997ccc894d88b70b32022cd606eae02 (patch) | |
| tree | d030534ebd171582e8672d1aecc55b8b4d604f90 | |
| parent | 5da63ce17ae211f37d15fdce4dcb409929efe9d6 (diff) | |
| download | buildSrc-ce55aca44997ccc894d88b70b32022cd606eae02.tar.gz | |
Fix windows build break
A set of windows build bots is still using Python2, versus Python3,
causing the build script to fail.
Bug: 247123181
Change-Id: I72b3bd9aa80cf42ed8c8bd2d4732b6fb403f7e85
| -rw-r--r-- | servers/server_config.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/servers/server_config.py b/servers/server_config.py index 74e1204..773c3ed 100644 --- a/servers/server_config.py +++ b/servers/server_config.py @@ -20,7 +20,6 @@ import logging import os import platform import socket -import urllib.request from distutils.spawn import find_executable from utils import AOSP_ROOT, run @@ -69,6 +68,8 @@ class ServerConfig(object): def __in_gce(self): """Queries the magic url to determine if we are in GCE""" try: + # TODO(jansene): Remove once windows buildbots are using PY3 + import urllib.request with urllib.request.urlopen("http://metadata.google.internal") as r: return r.getheader("Metadata-Flavor") == "Google" except: |