diff -Nru gce-compute-image-packages-20181206+dfsg1/debian/changelog gce-compute-image-packages-20190124+dfsg1/debian/changelog --- gce-compute-image-packages-20181206+dfsg1/debian/changelog 2019-01-07 07:50:42.000000000 +0000 +++ gce-compute-image-packages-20190124+dfsg1/debian/changelog 2019-01-25 07:38:44.000000000 +0000 @@ -1,3 +1,16 @@ +gce-compute-image-packages (20190124+dfsg1-0ubuntu1~16.04.0) xenial; urgency=medium + + * Rebuild for Xenial + + -- Balint Reczey Fri, 25 Jan 2019 14:38:44 +0700 + +gce-compute-image-packages (20190124+dfsg1-0ubuntu1) disco; urgency=medium + + * New upstream version 20190124 (LP: #1813246) + - Update script retrieval to support Python 3 + + -- Balint Reczey Fri, 25 Jan 2019 12:41:07 +0700 + gce-compute-image-packages (20181206+dfsg1-0ubuntu1~16.04.0) xenial; urgency=medium * Backport to Xenial with the following remaining changes: diff -Nru gce-compute-image-packages-20181206+dfsg1/google_compute_engine/metadata_scripts/script_retriever.py gce-compute-image-packages-20190124+dfsg1/google_compute_engine/metadata_scripts/script_retriever.py --- gce-compute-image-packages-20181206+dfsg1/google_compute_engine/metadata_scripts/script_retriever.py 2018-12-08 00:21:48.000000000 +0000 +++ gce-compute-image-packages-20190124+dfsg1/google_compute_engine/metadata_scripts/script_retriever.py 2019-01-24 19:28:43.000000000 +0000 @@ -81,7 +81,7 @@ request = urlrequest.Request(url) request.add_unredirected_header('Metadata-Flavor', 'Google') request.add_unredirected_header('Authorization', self.token) - content = urlrequest.urlopen(request).read() + content = urlrequest.urlopen(request).read().decode('utf-8') except (httpclient.HTTPException, socket.error, urlerror.URLError) as e: self.logger.warning('Could not download %s. %s.', url, str(e)) return None diff -Nru gce-compute-image-packages-20181206+dfsg1/google_compute_engine/metadata_scripts/tests/script_retriever_test.py gce-compute-image-packages-20190124+dfsg1/google_compute_engine/metadata_scripts/tests/script_retriever_test.py --- gce-compute-image-packages-20181206+dfsg1/google_compute_engine/metadata_scripts/tests/script_retriever_test.py 2018-12-08 00:21:48.000000000 +0000 +++ gce-compute-image-packages-20190124+dfsg1/google_compute_engine/metadata_scripts/tests/script_retriever_test.py 2019-01-24 19:28:43.000000000 +0000 @@ -60,7 +60,7 @@ mocked_request.add_unredirected_header.assert_called_with( 'Authorization', 'bar') mock_urlopen.assert_called_with(mocked_request) - urlopen_read = mock_urlopen().read(return_value='foo') + urlopen_read = mock_urlopen().read(return_value=b'foo').decode() self.mock_logger.warning.assert_not_called() mock_open.assert_called_once_with(self.dest, 'w') diff -Nru gce-compute-image-packages-20181206+dfsg1/setup.py gce-compute-image-packages-20190124+dfsg1/setup.py --- gce-compute-image-packages-20181206+dfsg1/setup.py 2018-12-08 00:21:48.000000000 +0000 +++ gce-compute-image-packages-20190124+dfsg1/setup.py 2019-01-24 19:28:43.000000000 +0000 @@ -36,7 +36,7 @@ packages=setuptools.find_packages(), scripts=glob.glob('scripts/*'), url='https://github.com/GoogleCloudPlatform/compute-image-packages', - version='2.8.12', + version='2.8.13', # Entry points create scripts in /usr/bin that call a function. entry_points={ 'console_scripts': [ diff -Nru gce-compute-image-packages-20181206+dfsg1/specs/google-compute-engine.spec gce-compute-image-packages-20190124+dfsg1/specs/google-compute-engine.spec --- gce-compute-image-packages-20181206+dfsg1/specs/google-compute-engine.spec 2018-12-08 00:21:48.000000000 +0000 +++ gce-compute-image-packages-20190124+dfsg1/specs/google-compute-engine.spec 2019-01-24 19:28:43.000000000 +0000 @@ -18,7 +18,7 @@ %endif Name: google-compute-engine -Version: 2.8.12 +Version: 2.8.13 Release: 1%{?dist} Summary: Google Compute Engine guest environment. License: ASL 2.0 diff -Nru gce-compute-image-packages-20181206+dfsg1/specs/python-google-compute-engine.spec gce-compute-image-packages-20190124+dfsg1/specs/python-google-compute-engine.spec --- gce-compute-image-packages-20181206+dfsg1/specs/python-google-compute-engine.spec 2018-12-08 00:21:48.000000000 +0000 +++ gce-compute-image-packages-20190124+dfsg1/specs/python-google-compute-engine.spec 2019-01-24 19:28:43.000000000 +0000 @@ -18,7 +18,7 @@ %endif Name: python-google-compute-engine -Version: 2.8.12 +Version: 2.8.13 Release: 1%{?dist} Summary: Google Compute Engine python library License: ASL 2.0