Merge "Fix gcloud can't run on python2 during acloud setup."
diff --git a/public/data/default.config b/public/data/default.config
index 71301ae..8ef1322 100644
--- a/public/data/default.config
+++ b/public/data/default.config
@@ -18,7 +18,7 @@
network: "default"
extra_data_disk_size_gb: 0
instance_name_pattern: "ins-{uuid}-{build_id}-{build_target}"
- fetch_cvd_version: "5941063"
+ fetch_cvd_version: "6170097"
metadata_variable {
key: "camera_front"
diff --git a/setup/setup_common.py b/setup/setup_common.py
index 7ed9bde..f5ded57 100644
--- a/setup/setup_common.py
+++ b/setup/setup_common.py
@@ -132,11 +132,9 @@
installed_ver,
candidate_ver)
return False
- # installed package is old and we care about the version.
+ # TODO(148116924):Setup process should ask user to update package if the
+ # minimax required version is specified.
if compare_version and installed_ver != candidate_ver:
- logger.debug("Package %s version at %s, expected %s",
- pkg_name,
- installed_ver,
- candidate_ver)
- return False
+ logger.warning("Package %s version at %s, expected %s",
+ pkg_name, installed_ver, candidate_ver)
return True
diff --git a/setup/setup_common_test.py b/setup/setup_common_test.py
index d17d2dc..5a00cfc 100644
--- a/setup/setup_common_test.py
+++ b/setup/setup_common_test.py
@@ -61,15 +61,15 @@
setup_common.PackageInstalled("fake_package")
# pylint: disable=invalid-name
- def testPackageInstalledFalseForOldVersion(self):
- """Test PackageInstalled should return False when pkg is out-of-date."""
+ def testPackageInstalledForOldVersion(self):
+ """Test PackageInstalled should return True when pkg is out-of-date."""
self.Patch(
setup_common,
"CheckCmdOutput",
return_value=self.PKG_INFO_OLD_VERSION)
- self.assertFalse(setup_common.PackageInstalled("fake_package",
- compare_version=True))
+ self.assertTrue(setup_common.PackageInstalled("fake_package",
+ compare_version=True))
def testPackageInstalled(self):
"""Test PackageInstalled should return True when pkg is installed."""