Commit 565d75b1 authored by Bastian Blank's avatar Bastian Blank

Re-format patches

parent c1848462
From b3a5d92994de8ef21c3c155750977256d8ddfbd3 Mon Sep 17 00:00:00 2001
From: Thomas Goirand <zigo@debian.org>
Date: Mon, 21 Nov 2016 19:10:45 +0100
Subject: disable-rhel-set-hostname-test
......@@ -9,11 +8,11 @@ Last-Update: 2013-05-29
tests/unittests/test_handler/test_handler_set_hostname.py | 1 +
1 file changed, 1 insertion(+)
Index: cloud-init/tests/unittests/test_handler/test_handler_set_hostname.py
===================================================================
--- cloud-init.orig/tests/unittests/test_handler/test_handler_set_hostname.py
+++ cloud-init/tests/unittests/test_handler/test_handler_set_hostname.py
@@ -35,6 +35,7 @@ class TestHostname(t_help.FilesystemMock
diff --git a/tests/unittests/test_handler/test_handler_set_hostname.py b/tests/unittests/test_handler/test_handler_set_hostname.py
index d09ec23..382efe7 100644
--- a/tests/unittests/test_handler/test_handler_set_hostname.py
+++ b/tests/unittests/test_handler/test_handler_set_hostname.py
@@ -35,6 +35,7 @@ class TestHostname(t_help.FilesystemMockingTestCase):
return cls(kind, {}, paths)
def test_write_hostname_rhel(self):
......
From 2e1fe451c535394e3f12c04cca8b31357ade6c5c Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Mon, 21 Nov 2016 19:10:46 +0100
Subject: Make Azure datasource run without root
Forwarded: https://bugs.launchpad.net/cloud-init/+bug/1536961
---
cloudinit/sources/DataSourceAzure.py | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py
index c5af8b84..0314b869 100644
--- a/cloudinit/sources/DataSourceAzure.py
+++ b/cloudinit/sources/DataSourceAzure.py
@@ -206,10 +206,15 @@ class DataSourceAzureNet(sources.DataSource):
LOG.debug("using files cached in %s", ddir)
# azure / hyper-v provides random data here
- seed = util.load_file("/sys/firmware/acpi/tables/OEM0",
- quiet=True, decode=False)
- if seed:
- self.metadata['random_seed'] = seed
+ try:
+ seed = util.load_file("/sys/firmware/acpi/tables/OEM0",
+ quiet=True, decode=False)
+ if seed:
+ self.metadata['random_seed'] = seed
+
+ # Don't fail if we can't read this file
+ except IOError:
+ pass
# now update ds_cfg to reflect contents pass in config
user_ds_cfg = util.get_cfg_by_path(self.cfg, DS_CFG_PATH, {})
From ad2024baa87a8b3cad4cb2617f0ad15dc94252ab Mon Sep 17 00:00:00 2001
From: Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Date: Sat, 24 Sep 2016 13:10:17 +0200
Subject: Skip test_apt_v3_mirror_search_dns
......@@ -7,11 +6,11 @@ Subject: Skip test_apt_v3_mirror_search_dns
tests/unittests/test_handler/test_handler_apt_source_v3.py | 4 ++++
1 file changed, 4 insertions(+)
Index: cloud-init/tests/unittests/test_handler/test_handler_apt_source_v3.py
===================================================================
--- cloud-init.orig/tests/unittests/test_handler/test_handler_apt_source_v3.py
+++ cloud-init/tests/unittests/test_handler/test_handler_apt_source_v3.py
@@ -944,6 +944,10 @@ deb http://ubuntu.com/ubuntu/ xenial-pro
diff --git a/tests/unittests/test_handler/test_handler_apt_source_v3.py b/tests/unittests/test_handler/test_handler_apt_source_v3.py
index 7a64c23..f85ec31 100644
--- a/tests/unittests/test_handler/test_handler_apt_source_v3.py
+++ b/tests/unittests/test_handler/test_handler_apt_source_v3.py
@@ -944,6 +944,10 @@ deb http://ubuntu.com/ubuntu/ xenial-proposed main""")
def test_apt_v3_mirror_search_dns(self):
"""test_apt_v3_mirror_search_dns - Test searching dns patterns"""
......
From d7fd4d9f9dfe27b6bd51c473e4296952a6cb90c1 Mon Sep 17 00:00:00 2001
From: Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Date: Sat, 24 Sep 2016 14:51:58 +0200
Subject: Skip Cloudstack tests that expect network
......@@ -7,11 +6,11 @@ Subject: Skip Cloudstack tests that expect network
tests/unittests/test_datasource/test_cloudstack.py | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
Index: cloud-init/tests/unittests/test_datasource/test_cloudstack.py
===================================================================
--- cloud-init.orig/tests/unittests/test_datasource/test_cloudstack.py
+++ cloud-init/tests/unittests/test_datasource/test_cloudstack.py
@@ -43,6 +43,9 @@ class TestCloudStackPasswordFetching(CiT
diff --git a/tests/unittests/test_datasource/test_cloudstack.py b/tests/unittests/test_datasource/test_cloudstack.py
index d6d2d6b..c52b063 100644
--- a/tests/unittests/test_datasource/test_cloudstack.py
+++ b/tests/unittests/test_datasource/test_cloudstack.py
@@ -43,6 +43,9 @@ class TestCloudStackPasswordFetching(CiTestCase):
return subp
def test_empty_password_doesnt_create_config(self):
......@@ -21,7 +20,7 @@ Index: cloud-init/tests/unittests/test_datasource/test_cloudstack.py
self._set_password_server_response('')
ds = DataSourceCloudStack(
{}, None, helpers.Paths({'run_dir': self.tmp}))
@@ -50,6 +53,9 @@ class TestCloudStackPasswordFetching(CiT
@@ -50,6 +53,9 @@ class TestCloudStackPasswordFetching(CiTestCase):
self.assertEqual({}, ds.get_config_obj())
def test_saved_password_doesnt_create_config(self):
......@@ -31,7 +30,7 @@ Index: cloud-init/tests/unittests/test_datasource/test_cloudstack.py
self._set_password_server_response('saved_password')
ds = DataSourceCloudStack(
{}, None, helpers.Paths({'run_dir': self.tmp}))
@@ -57,6 +63,9 @@ class TestCloudStackPasswordFetching(CiT
@@ -57,6 +63,9 @@ class TestCloudStackPasswordFetching(CiTestCase):
self.assertEqual({}, ds.get_config_obj())
def test_password_sets_password(self):
......@@ -41,7 +40,7 @@ Index: cloud-init/tests/unittests/test_datasource/test_cloudstack.py
password = 'SekritSquirrel'
self._set_password_server_response(password)
ds = DataSourceCloudStack(
@@ -65,6 +74,9 @@ class TestCloudStackPasswordFetching(CiT
@@ -65,6 +74,9 @@ class TestCloudStackPasswordFetching(CiTestCase):
self.assertEqual(password, ds.get_config_obj()['password'])
def test_bad_request_doesnt_stop_ds_from_working(self):
......@@ -51,7 +50,7 @@ Index: cloud-init/tests/unittests/test_datasource/test_cloudstack.py
self._set_password_server_response('bad_request')
ds = DataSourceCloudStack(
{}, None, helpers.Paths({'run_dir': self.tmp}))
@@ -80,6 +92,9 @@ class TestCloudStackPasswordFetching(CiT
@@ -80,6 +92,9 @@ class TestCloudStackPasswordFetching(CiTestCase):
self.assertEqual(expected_request_types, request_types)
def test_valid_response_means_password_marked_as_saved(self):
......@@ -61,7 +60,7 @@ Index: cloud-init/tests/unittests/test_datasource/test_cloudstack.py
password = 'SekritSquirrel'
subp = self._set_password_server_response(password)
ds = DataSourceCloudStack(
@@ -89,6 +104,9 @@ class TestCloudStackPasswordFetching(CiT
@@ -89,6 +104,9 @@ class TestCloudStackPasswordFetching(CiTestCase):
['send_my_password', 'saved_password'])
def _check_password_not_saved_for(self, response_string):
......
From 4c399fe29af1bbae270b73079ee3e6db0d0df7f8 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Sun, 4 Dec 2016 12:13:49 +0100
Subject: Drop all unused extended version handling
......@@ -8,10 +7,10 @@ Subject: Drop all unused extended version handling
1 file changed, 3 insertions(+), 22 deletions(-)
diff --git a/tools/read-version b/tools/read-version
index 3b30b497..a8e1c22b 100755
index 3ea9e66..a8d3484 100755
--- a/tools/read-version
+++ b/tools/read-version
@@ -62,27 +62,9 @@
@@ -62,27 +62,9 @@ use_long = '--long' in sys.argv or os.environ.get('CI_RV_LONG')
use_tags = '--tags' in sys.argv or os.environ.get('CI_RV_TAGS')
output_json = '--json' in sys.argv
......@@ -40,7 +39,7 @@ index 3b30b497..a8e1c22b 100755
# version is X.Y.Z[+xxx.gHASH]
# version_long is None or X.Y.Z-xxx-gHASH
release = version.partition("-")[0]
@@ -91,9 +73,8 @@
@@ -91,9 +73,8 @@ commit = None
distance = None
if version_long:
......
From c3817d0a8a9f60b187a626c08d351ce07b213a79 Mon Sep 17 00:00:00 2001
From: Thomas Goirand <zigo@debian.org>
Date: Mon, 16 Oct 2017 22:11:38 +0000
Subject: Fix message when a local is missing.
......@@ -8,10 +7,10 @@ Subject: Fix message when a local is missing.
1 file changed, 4 insertions(+), 33 deletions(-)
diff --git a/tools/Z99-cloud-locale-test.sh b/tools/Z99-cloud-locale-test.sh
index 5912bae2..5ad3b9a6 100755
index 4978d87..cb414b5 100644
--- a/tools/Z99-cloud-locale-test.sh
+++ b/tools/Z99-cloud-locale-test.sh
@@ -52,39 +52,10 @@
@@ -52,39 +52,10 @@ locale_warn() {
printf " The unknown environment variables are:\n %s\n" "$bad_kv"
printf " This can affect your user experience significantly, including the\n"
printf " ability to manage packages. You may install the locales by running:\n\n"
......
Description: cloud-init before chronyd
Author: Thomas Goirand <zigo@debian.org>
From: Thomas Goirand <zigo@debian.org>
Date: Fri, 8 Feb 2019 14:45:04 +0100
Subject: cloud-init before chronyd
Bug-Debian: https://bugs.debian.org/910801
Forwarded: no
Last-Update: 2018-10-15
---
systemd/cloud-init.service.tmpl | 1 +
1 file changed, 1 insertion(+)
--- cloud-init-18.3.orig/systemd/cloud-init.service.tmpl
+++ cloud-init-18.3/systemd/cloud-init.service.tmpl
diff --git a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl
index b92e8ab..7ec25d6 100644
--- a/systemd/cloud-init.service.tmpl
+++ b/systemd/cloud-init.service.tmpl
@@ -21,6 +21,7 @@ After=wicked.service
After=dbus.service
{% endif %}
......
Description: Fix sysv-init dependencies.
From: Debian Cloud Team <debian-cloud@lists.debian.org>
Date: Fri, 8 Feb 2019 14:45:04 +0100
Subject: Fix sysv-init dependencies.
Forwarded: no
Last-Update: 2018-09-17
---
sysvinit/debian/cloud-config | 4 ++--
sysvinit/debian/cloud-final | 2 +-
sysvinit/debian/cloud-init-local | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
--- cloud-init-18.3.orig/sysvinit/debian/cloud-config
+++ cloud-init-18.3/sysvinit/debian/cloud-config
diff --git a/sysvinit/debian/cloud-config b/sysvinit/debian/cloud-config
index 5332274..5e4289f 100644
--- a/sysvinit/debian/cloud-config
+++ b/sysvinit/debian/cloud-config
@@ -1,8 +1,8 @@
#! /bin/sh
### BEGIN INIT INFO
......@@ -15,8 +25,10 @@ Last-Update: 2018-09-17
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Cloud init modules --mode config
--- cloud-init-18.3.orig/sysvinit/debian/cloud-final
+++ cloud-init-18.3/sysvinit/debian/cloud-final
diff --git a/sysvinit/debian/cloud-final b/sysvinit/debian/cloud-final
index 55afc8b..3c98063 100644
--- a/sysvinit/debian/cloud-final
+++ b/sysvinit/debian/cloud-final
@@ -2,7 +2,7 @@
### BEGIN INIT INFO
# Provides: cloud-final
......@@ -26,8 +38,10 @@ Last-Update: 2018-09-17
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Cloud init modules final jobs
--- cloud-init-18.3.orig/sysvinit/debian/cloud-init-local
+++ cloud-init-18.3/sysvinit/debian/cloud-init-local
diff --git a/sysvinit/debian/cloud-init-local b/sysvinit/debian/cloud-init-local
index 802ee8e..e419297 100644
--- a/sysvinit/debian/cloud-init-local
+++ b/sysvinit/debian/cloud-init-local
@@ -2,7 +2,7 @@
### BEGIN INIT INFO
# Provides: cloud-init-local
......
0002-disable-rhel-set-hostname-test.patch
#0003-Make-Azure-datasource-run-without-root.patch
0006-Skip-test_apt_v3_mirror_search_dns.patch
0007-Skip-Cloudstack-tests-that-expect-network.patch
0009-Drop-all-unused-extended-version-handling.patch
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment