[Debian-ha-commits] [pcs] 03/05: Update debian/patches for new version
Valentin Vidic
vvidic-guest at moszumanska.debian.org
Mon Sep 26 18:16:09 UTC 2016
This is an automated email from the git hooks/post-receive script.
vvidic-guest pushed a commit to branch master
in repository pcs.
commit aa16d3d25c39f1bb277c6fa5e9536ea8c4d84733
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date: Mon Sep 26 20:00:37 2016 +0200
Update debian/patches for new version
---
.../0001-Remove-Gemlock.file-on-Debian.patch | 4 +-
debian/patches/0006-Replace-orderedhash.patch | 2 +-
debian/patches/0007-Fix-IPv6-bind.patch | 2 +-
debian/patches/0008-Fix-corosync-log.patch | 2 +-
debian/patches/0009-Fix-testsuite.patch | 13 +-
debian/patches/0010-Replace-chkconfig.patch | 194 +++++++++++----------
debian/patches/series | 1 -
7 files changed, 110 insertions(+), 108 deletions(-)
diff --git a/debian/patches/0001-Remove-Gemlock.file-on-Debian.patch b/debian/patches/0001-Remove-Gemlock.file-on-Debian.patch
index 1e81270..494679e 100644
--- a/debian/patches/0001-Remove-Gemlock.file-on-Debian.patch
+++ b/debian/patches/0001-Remove-Gemlock.file-on-Debian.patch
@@ -17,13 +17,12 @@ deleted file mode 100644
index 3140d6f..0000000
--- a/pcsd/Gemfile.lock
+++ /dev/null
-@@ -1,46 +0,0 @@
+@@ -1,44 +0,0 @@
-GEM
- remote: https://rubygems.org/
- remote: https://tojeline.fedorapeople.org/rubygems/
- specs:
- backports (3.6.8)
-- eventmachine (1.2.0.1)
- json (1.8.3)
- multi_json (1.12.0)
- open4 (1.3.4)
@@ -52,7 +51,6 @@ index 3140d6f..0000000
-
-DEPENDENCIES
- backports
-- eventmachine
- json
- multi_json
- open4
diff --git a/debian/patches/0006-Replace-orderedhash.patch b/debian/patches/0006-Replace-orderedhash.patch
index c7605db..cb6bdbb 100644
--- a/debian/patches/0006-Replace-orderedhash.patch
+++ b/debian/patches/0006-Replace-orderedhash.patch
@@ -92,7 +92,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
perm_hash['allow'] = @allow_list.uniq.sort
--- a/pcsd/Gemfile
+++ b/pcsd/Gemfile
-@@ -16,4 +16,4 @@
+@@ -15,4 +15,4 @@
gem 'json'
gem 'multi_json'
gem 'open4'
diff --git a/debian/patches/0007-Fix-IPv6-bind.patch b/debian/patches/0007-Fix-IPv6-bind.patch
index 6e4b02e..81f24a0 100644
--- a/debian/patches/0007-Fix-IPv6-bind.patch
+++ b/debian/patches/0007-Fix-IPv6-bind.patch
@@ -42,7 +42,7 @@ Last-Update: 2016-06-17
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/pcsd/ssl.rb
+++ b/pcsd/ssl.rb
-@@ -105,6 +105,10 @@
+@@ -128,6 +128,10 @@
end
end
diff --git a/debian/patches/0008-Fix-corosync-log.patch b/debian/patches/0008-Fix-corosync-log.patch
index 27d93f1..2367faf 100644
--- a/debian/patches/0008-Fix-corosync-log.patch
+++ b/debian/patches/0008-Fix-corosync-log.patch
@@ -1,6 +1,6 @@
--- a/pcs/cluster.py
+++ b/pcs/cluster.py
-@@ -726,7 +726,7 @@
+@@ -730,7 +730,7 @@
quorum_section.add_attribute("two_node", "1")
logging_section.add_attribute("to_logfile", "yes")
diff --git a/debian/patches/0009-Fix-testsuite.patch b/debian/patches/0009-Fix-testsuite.patch
index cbf3a7f..51ddbbe 100644
--- a/debian/patches/0009-Fix-testsuite.patch
+++ b/debian/patches/0009-Fix-testsuite.patch
@@ -294,7 +294,7 @@
""")
--- a/pcs/test/test_resource.py
+++ b/pcs/test/test_resource.py
-@@ -2640,7 +2640,7 @@
+@@ -2654,7 +2654,7 @@
assert output == " Master: D1-master-custom\n Resource: D1 (class=ocf provider=heartbeat type=Dummy)\n Operations: monitor interval=60s (D1-monitor-interval-60s)\n Resource: D0 (class=ocf provider=heartbeat type=Dummy)\n Operations: monitor interval=60s (D0-monitor-interval-60s)\n Resource: D2 (class=ocf provider=heartbeat type=Dummy)\n Operations: monitor interval=60s (D2-monitor-interval-60s)\n", [output]
def testLSBResource(self):
@@ -314,14 +314,3 @@
]],
$logger.log
)
---- a/pcs/test/test_utils.py
-+++ b/pcs/test/test_utils.py
-@@ -1797,7 +1797,7 @@
- wait_seconds=.1
- )
-
-- self.assertEqual(log, ['first', 'second'])
-+ self.assertEqual(sorted(log), ['first', 'second'])
-
- def test_wait_for_slower_workers(self):
- log = []
diff --git a/debian/patches/0010-Replace-chkconfig.patch b/debian/patches/0010-Replace-chkconfig.patch
index 63085f1..58f53f0 100644
--- a/debian/patches/0010-Replace-chkconfig.patch
+++ b/debian/patches/0010-Replace-chkconfig.patch
@@ -1,6 +1,6 @@
--- a/pcsd/pcs.rb
+++ b/pcsd/pcs.rb
-@@ -1894,11 +1894,22 @@
+@@ -1956,11 +1956,22 @@
def is_service_enabled?(service)
if ISSYSTEMCTL
cmd = ['systemctl', 'is-enabled', "#{service}.service"]
@@ -26,7 +26,7 @@
end
def is_service_running?(service)
-@@ -1913,12 +1924,13 @@
+@@ -1975,12 +1986,13 @@
def is_service_installed?(service)
unless ISSYSTEMCTL
@@ -42,7 +42,7 @@
return true
end
return false
-@@ -1944,7 +1956,7 @@
+@@ -2006,7 +2018,7 @@
cmd = ['systemctl', 'enable', "#{service}.service"]
else
# fails when the service is not installed
@@ -51,84 +51,27 @@
end
_, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
return (retcode == 0)
-@@ -1959,7 +1971,7 @@
- return true
- end
- # fails when the service is not installed, so we need to check it beforehand
+@@ -2021,7 +2033,7 @@
+ if ISSYSTEMCTL
+ cmd = ['systemctl', 'disable', "#{service}.service"]
+ else
- cmd = ['chkconfig', service, 'off']
+ cmd = ['update-rc.d', service, 'disable']
end
_, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
return (retcode == 0)
---- a/pcs/lib/external.py
-+++ b/pcs/lib/external.py
-@@ -123,7 +123,7 @@
- else:
- if not is_service_installed(runner, service):
- return
-- output, retval = runner.run(["chkconfig", service, "off"])
-+ output, retval = runner.run(["update-rc.d", service, "disable"])
- if retval != 0:
- raise DisableServiceError(service, output.rstrip())
-
-@@ -141,7 +141,7 @@
- "systemctl", "enable", service + ".service"
- ])
- else:
-- output, retval = runner.run(["chkconfig", service, "on"])
-+ output, retval = runner.run(["update-rc.d", service, "enable"])
- if retval != 0:
- raise EnableServiceError(service, output.rstrip())
-
-@@ -207,10 +207,17 @@
- _, retval = runner.run(
- ["systemctl", "is-enabled", service + ".service"]
- )
-+ return retval == 0
- else:
-- _, retval = runner.run(["chkconfig", service])
--
-- return retval == 0
-+ output, return_code = runner.run(["insserv", "-s"])
-+ if return_code != 0:
-+ return False
-+
-+ for line in output.splitlines():
-+ fields = line.split(":")
-+ if fields[3] == service and fields[0] == "S":
-+ return True
-+ return False
-
-
- def is_service_running(runner, service):
-@@ -250,13 +257,13 @@
- if is_systemctl():
- return []
-
-- output, return_code = runner.run(["chkconfig"], ignore_stderr=True)
-+ output, return_code = runner.run(["insserv", "-s"], ignore_stderr=True)
- if return_code != 0:
- return []
-
- service_list = []
- for service in output.splitlines():
-- service = service.split(" ", 1)[0]
-+ service = service.split(":")[3]
- if service:
- service_list.append(service)
- return service_list
--- a/pcs/test/test_lib_external.py
+++ b/pcs/test/test_lib_external.py
-@@ -1043,7 +1043,7 @@
- self.mock_runner.run.return_value = ("", 0)
+@@ -1077,7 +1077,7 @@
+ self.mock_runner.run.return_value = ("", "", 0)
lib.disable_service(self.mock_runner, self.service)
self.mock_runner.run.assert_called_once_with(
- ["chkconfig", self.service, "off"]
+ ["update-rc.d", self.service, "disable"]
)
- @mock.patch("pcs.lib.external.is_service_installed")
-@@ -1056,7 +1056,7 @@
+ def test_not_systemctl_failed(self, mock_is_installed, mock_systemctl):
+@@ -1089,7 +1089,7 @@
lambda: lib.disable_service(self.mock_runner, self.service)
)
self.mock_runner.run.assert_called_once_with(
@@ -136,9 +79,18 @@
+ ["update-rc.d", self.service, "disable"]
)
- @mock.patch("pcs.lib.external.is_service_installed")
-@@ -1099,7 +1099,7 @@
- self.mock_runner.run.return_value = ("", 0)
+ def test_systemctl_not_installed(
+@@ -1125,7 +1125,7 @@
+ self.mock_runner.run.return_value = ("", "", 0)
+ lib.disable_service(self.mock_runner, self.service, instance="test")
+ self.mock_runner.run.assert_called_once_with(
+- ["chkconfig", self.service, "off"]
++ ["update-rc.d", self.service, "disable"]
+ )
+
+ @mock.patch("pcs.lib.external.is_systemctl")
+@@ -1158,7 +1158,7 @@
+ self.mock_runner.run.return_value = ("", "", 0)
lib.enable_service(self.mock_runner, self.service)
self.mock_runner.run.assert_called_once_with(
- ["chkconfig", self.service, "on"]
@@ -146,7 +98,7 @@
)
def test_not_systemctl_failed(self, mock_systemctl):
-@@ -1110,7 +1110,7 @@
+@@ -1169,7 +1169,7 @@
lambda: lib.enable_service(self.mock_runner, self.service)
)
self.mock_runner.run.assert_called_once_with(
@@ -154,13 +106,22 @@
+ ["update-rc.d", self.service, "enable"]
)
+ def test_instance_systemctl(self, mock_systemctl):
+@@ -1187,7 +1187,7 @@
+ self.mock_runner.run.return_value = ("", "", 0)
+ lib.enable_service(self.mock_runner, self.service, instance="test")
+ self.mock_runner.run.assert_called_once_with(
+- ["chkconfig", self.service, "on"]
++ ["update-rc.d", self.service, "enable"]
+ )
-@@ -1287,18 +1287,18 @@
+
+@@ -1396,18 +1396,18 @@
def test_not_systemctl_enabled(self, mock_systemctl):
mock_systemctl.return_value = False
-- self.mock_runner.run.return_value = ("", 0)
-+ self.mock_runner.run.return_value = ("S:02:2 3 4 5:" + self.service, 0)
+- self.mock_runner.run.return_value = ("", "", 0)
++ self.mock_runner.run.return_value = ("S:02:2 3 4 5:" + self.service, "", 0)
self.assertTrue(lib.is_service_enabled(self.mock_runner, self.service))
self.mock_runner.run.assert_called_once_with(
- ["chkconfig", self.service]
@@ -169,8 +130,8 @@
def test_not_systemctl_disabled(self, mock_systemctl):
mock_systemctl.return_value = False
-- self.mock_runner.run.return_value = ("", 3)
-+ self.mock_runner.run.return_value = ("K:01:0 1 6:" + self.service, 0)
+- self.mock_runner.run.return_value = ("", "", 3)
++ self.mock_runner.run.return_value = ("K:01:0 1 6:" + self.service, "", 0)
self.assertFalse(lib.is_service_enabled(self.mock_runner, self.service))
self.mock_runner.run.assert_called_once_with(
- ["chkconfig", self.service]
@@ -178,7 +139,7 @@
)
-@@ -1442,9 +1442,9 @@
+@@ -1550,23 +1550,23 @@
def test_success(self, mock_is_systemctl):
mock_is_systemctl.return_value = False
self.mock_runner.run.return_value = ("""\
@@ -188,24 +149,79 @@
+K:01:0 1 6:pcsd
+S:02:2 3 4 5:sbd
+S:02:2 3 4 5:pacemaker
- """, 0)
+ """, "", 0)
self.assertEqual(
lib.get_non_systemd_services(self.mock_runner),
-@@ -1452,7 +1452,7 @@
+ ["pcsd", "sbd", "pacemaker"]
)
self.assertEqual(mock_is_systemctl.call_count, 1)
- self.mock_runner.run.assert_called_once_with(
-- ["chkconfig"], ignore_stderr=True
-+ ["insserv", "-s"], ignore_stderr=True
- )
+- self.mock_runner.run.assert_called_once_with(["chkconfig"])
++ self.mock_runner.run.assert_called_once_with(["insserv", "-s"])
def test_failed(self, mock_is_systemctl):
-@@ -1461,7 +1461,7 @@
+ mock_is_systemctl.return_value = False
+ self.mock_runner.run.return_value = ("stdout", "failed", 1)
self.assertEqual(lib.get_non_systemd_services(self.mock_runner), [])
self.assertEqual(mock_is_systemctl.call_count, 1)
- self.mock_runner.run.assert_called_once_with(
-- ["chkconfig"], ignore_stderr=True
-+ ["insserv", "-s"], ignore_stderr=True
- )
+- self.mock_runner.run.assert_called_once_with(["chkconfig"])
++ self.mock_runner.run.assert_called_once_with(["insserv", "-s"])
def test_systemd(self, mock_is_systemctl):
+ mock_is_systemctl.return_value = True
+--- a/pcs/lib/external.py
++++ b/pcs/lib/external.py
+@@ -143,7 +143,7 @@
+ "systemctl", "disable", _get_service_name(service, instance)
+ ])
+ else:
+- stdout, stderr, retval = runner.run(["chkconfig", service, "off"])
++ stdout, stderr, retval = runner.run(["update-rc.d", service, "disable"])
+ if retval != 0:
+ raise DisableServiceError(
+ service,
+@@ -167,7 +167,7 @@
+ "systemctl", "enable", _get_service_name(service, instance)
+ ])
+ else:
+- stdout, stderr, retval = runner.run(["chkconfig", service, "on"])
++ stdout, stderr, retval = runner.run(["update-rc.d", service, "enable"])
+ if retval != 0:
+ raise EnableServiceError(
+ service,
+@@ -250,10 +250,17 @@
+ dummy_stdout, dummy_stderr, retval = runner.run(
+ ["systemctl", "is-enabled", _get_service_name(service, instance)]
+ )
++ return retval == 0
+ else:
+- dummy_stdout, dummy_stderr, retval = runner.run(["chkconfig", service])
+-
+- return retval == 0
++ stdout, dummy_stderr, retval = runner.run(["insserv", "-s"])
++ if retval != 0:
++ return False
++
++ for line in stdout.splitlines():
++ fields = line.split(":")
++ if fields[3] == service and fields[0] == "S":
++ return True
++ return False
+
+
+ def is_service_running(runner, service, instance=None):
+@@ -299,13 +306,13 @@
+ if is_systemctl():
+ return []
+
+- stdout, dummy_stderr, return_code = runner.run(["chkconfig"])
++ stdout, dummy_stderr, return_code = runner.run(["insserv", "-s"])
+ if return_code != 0:
+ return []
+
+ service_list = []
+ for service in stdout.splitlines():
+- service = service.split(" ", 1)[0]
++ service = service.split(":")[3]
+ if service:
+ service_list.append(service)
+ return service_list
diff --git a/debian/patches/series b/debian/patches/series
index b62b741..058bf3e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@
0004-Remove-pcsd-test-.gitignore-file.patch
0005-settings.py
0006-Replace-orderedhash.patch
-0007-Fix-IPv6-bind.patch
0008-Fix-corosync-log.patch
0009-Fix-testsuite.patch
0010-Replace-chkconfig.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/pcs.git
More information about the Debian-HA-Commits
mailing list