Fix typos, add some missed args and ensure consistency on where logger is defined.
Bug: None
Test: acloud-dev create --local-image
acloud-dev create --local-image --local-instance
Change-Id: I272cd82d68139e7d6ac27b84fdf725ce9818df3d
diff --git a/setup/base_task_runner.py b/setup/base_task_runner.py
index 20e76d1..7dd8f15 100644
--- a/setup/base_task_runner.py
+++ b/setup/base_task_runner.py
@@ -26,6 +26,7 @@
import os
import textwrap
+
logger = logging.getLogger(__name__)
_PARAGRAPH_BREAK = "="
diff --git a/setup/gcp_setup_runner.py b/setup/gcp_setup_runner.py
index 0a1b281..054b483 100644
--- a/setup/gcp_setup_runner.py
+++ b/setup/gcp_setup_runner.py
@@ -27,6 +27,9 @@
from acloud.setup import base_task_runner
from acloud.setup import google_sdk
+
+logger = logging.getLogger(__name__)
+
# APIs that need to be enabled for GCP project.
_ANDROID_BUILD_SERVICE = "androidbuildinternal.googleapis.com"
_COMPUTE_ENGINE_SERVICE = "compute.googleapis.com"
@@ -55,8 +58,6 @@
_PROJECT_RE = re.compile(r"^project = (?P<project>.+)")
_ZONE_RE = re.compile(r"^zone = (?P<zone>.+)")
-logger = logging.getLogger(__name__)
-
def UpdateConfigFile(config_path, item, value):
"""Update config data.
diff --git a/setup/google_sdk.py b/setup/google_sdk.py
index c012dfe..31ac0f8 100644
--- a/setup/google_sdk.py
+++ b/setup/google_sdk.py
@@ -39,6 +39,9 @@
from acloud import errors
from acloud.internal.lib import utils
+
+logger = logging.getLogger(__name__)
+
SDK_BIN_PATH = os.path.join("google-cloud-sdk", "bin")
GCLOUD_BIN = "gcloud"
GCP_SDK_VERSION = "209.0.0"
@@ -59,8 +62,6 @@
WIN = "windows"
MAC = "darwin"
-logger = logging.getLogger(__name__)
-
def GetSdkUrl():
"""Get google SDK tool url.
diff --git a/setup/host_setup_runner.py b/setup/host_setup_runner.py
index f994eb1..38caab5 100644
--- a/setup/host_setup_runner.py
+++ b/setup/host_setup_runner.py
@@ -29,6 +29,7 @@
from acloud.setup import base_task_runner
from acloud.setup import setup_common
+
logger = logging.getLogger(__name__)
# Install cuttlefish-common will probably not work now.
diff --git a/setup/setup_common.py b/setup/setup_common.py
index 06ee51e..7ed9bde 100644
--- a/setup/setup_common.py
+++ b/setup/setup_common.py
@@ -22,6 +22,7 @@
from acloud import errors
+
logger = logging.getLogger(__name__)
PKG_INSTALL_CMD = "sudo apt-get --assume-yes install %s"