aboutsummaryrefslogtreecommitdiff
path: root/release/tools/vmimage.subr
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2019-05-31 18:40:19 +0000
committerGlen Barber <gjb@FreeBSD.org>2019-05-31 18:40:19 +0000
commit899e81f9f8016522c9c58795e0f606ca5bc4bf08 (patch)
tree353a45250f01d4782b2c352b1fd02507002f49b2 /release/tools/vmimage.subr
parent8726929d67052e89f7849bdb4445f859e98038c8 (diff)
downloadsrc-899e81f9f8016522c9c58795e0f606ca5bc4bf08.tar.gz
src-899e81f9f8016522c9c58795e0f606ca5bc4bf08.zip
Revert r348438.
The fix to override the default python version when building the sysutils/py-google-compute-engine did not work, and there are still issues that need to be addressed in the port itself. See bugzilla 238267 for additional details. MFC after: 6 days MFC with: r348438 MFC note: no-op to appease the merge tracker Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/head/; revision=348474
Diffstat (limited to 'release/tools/vmimage.subr')
-rw-r--r--release/tools/vmimage.subr4
1 files changed, 0 insertions, 4 deletions
diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
index bcf9a285a293..6e29139402be 100644
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -72,10 +72,6 @@ cleanup() {
mdconfig -d -u ${mddev}
fi
- # Avoid inheriting the DEFAULT_VERSIONS for lang/python from
- # the gce.conf.
- unset DEFAULT_VERSIONS
-
return 0
}