[Debian-ha-commits] [pcs] 04/05: d/patches: refresh for new version
Valentin Vidic
vvidic-guest at moszumanska.debian.org
Fri Jun 30 16:37:14 UTC 2017
This is an automated email from the git hooks/post-receive script.
vvidic-guest pushed a commit to branch master
in repository pcs.
commit 486b370fccb11d66ac24fd3ab760a2e76a7c5341
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date: Fri Jun 30 18:31:41 2017 +0200
d/patches: refresh for new version
---
debian/patches/0007-Fix-testsuite.patch | 119 +++++++++++++++++++---------
debian/patches/0008-Replace-chkconfig.patch | 8 +-
debian/patches/0009-Fix-python-lxml.patch | 2 +-
3 files changed, 86 insertions(+), 43 deletions(-)
diff --git a/debian/patches/0007-Fix-testsuite.patch b/debian/patches/0007-Fix-testsuite.patch
index 7eabd33..f3f9427 100644
--- a/debian/patches/0007-Fix-testsuite.patch
+++ b/debian/patches/0007-Fix-testsuite.patch
@@ -6,7 +6,7 @@ Last-Update: 2016-11-13
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/pcs/test/test_cluster.py
+++ b/pcs/test/test_cluster.py
-@@ -255,7 +255,7 @@
+@@ -256,7 +256,7 @@
logging {
to_logfile: yes
@@ -15,7 +15,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
"""
-@@ -313,7 +313,7 @@
+@@ -315,7 +315,7 @@
logging {
to_logfile: yes
@@ -24,7 +24,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -459,7 +459,7 @@
+@@ -458,7 +458,7 @@
logging {
to_logfile: yes
@@ -42,7 +42,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -543,7 +543,7 @@
+@@ -566,7 +566,7 @@
logging {
to_logfile: yes
@@ -51,7 +51,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -588,7 +588,7 @@
+@@ -611,7 +611,7 @@
logging {
to_logfile: yes
@@ -60,7 +60,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -629,7 +629,7 @@
+@@ -652,7 +652,7 @@
logging {
to_logfile: yes
@@ -69,7 +69,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -663,7 +663,7 @@
+@@ -698,7 +698,7 @@
logging {
to_logfile: yes
@@ -78,7 +78,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -710,7 +710,7 @@
+@@ -740,7 +740,7 @@
logging {
to_logfile: yes
@@ -87,7 +87,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -755,7 +755,7 @@
+@@ -775,7 +775,7 @@
logging {
to_logfile: yes
@@ -96,7 +96,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -795,7 +795,7 @@
+@@ -823,7 +823,7 @@
logging {
to_logfile: yes
@@ -105,7 +105,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -844,7 +844,7 @@
+@@ -869,7 +869,7 @@
logging {
to_logfile: yes
@@ -114,7 +114,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -889,7 +889,7 @@
+@@ -910,7 +910,7 @@
logging {
to_logfile: yes
@@ -123,7 +123,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -1290,7 +1290,7 @@
+@@ -960,7 +960,7 @@
logging {
to_logfile: yes
@@ -132,7 +132,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -1411,7 +1411,7 @@
+@@ -1006,7 +1006,7 @@
logging {
to_logfile: yes
@@ -141,7 +141,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -1469,7 +1469,7 @@
+@@ -1408,7 +1408,7 @@
logging {
to_logfile: yes
@@ -150,7 +150,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -1527,7 +1527,7 @@
+@@ -1530,7 +1530,7 @@
logging {
to_logfile: yes
@@ -159,7 +159,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -1587,7 +1587,7 @@
+@@ -1589,7 +1589,7 @@
logging {
to_logfile: yes
@@ -168,7 +168,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -1652,7 +1652,7 @@
+@@ -1648,7 +1648,7 @@
logging {
to_logfile: yes
@@ -177,7 +177,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -1716,7 +1716,7 @@
+@@ -1709,7 +1709,7 @@
logging {
to_logfile: yes
@@ -186,7 +186,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -1780,7 +1780,7 @@
+@@ -1775,7 +1775,7 @@
logging {
to_logfile: yes
@@ -195,7 +195,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -1868,7 +1868,7 @@
+@@ -1840,7 +1840,7 @@
logging {
to_logfile: yes
@@ -204,7 +204,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -2455,7 +2455,7 @@
+@@ -1905,7 +1905,7 @@
logging {
to_logfile: yes
@@ -213,7 +213,25 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -2692,7 +2692,7 @@
+@@ -1994,7 +1994,7 @@
+
+ logging {
+ to_logfile: yes
+- logfile: /var/log/cluster/corosync.log
++ logfile: /var/log/corosync/corosync.log
+ to_syslog: yes
+ }
+ """)
+@@ -2582,7 +2582,7 @@
+
+ logging {
+ to_logfile: yes
+- logfile: /var/log/cluster/corosync.log
++ logfile: /var/log/corosync/corosync.log
+ to_syslog: yes
+ }
+ """)
+@@ -2820,7 +2820,7 @@
logging {
to_logfile: yes
@@ -262,7 +280,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/pcs/test/test_stonith.py
+++ b/pcs/test/test_stonith.py
-@@ -275,7 +275,7 @@
+@@ -279,7 +279,7 @@
output, returnVal = pcs(
temp_cib,
@@ -271,7 +289,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
)
ac(output, "")
self.assertEqual(0, returnVal)
-@@ -291,7 +291,7 @@
+@@ -295,7 +295,7 @@
Resource: f3 (class=stonith type=fence_scsi)
Meta Attrs: provides=unfencing
Operations: monitor interval=60s (f3-monitor-interval-60s)
@@ -280,7 +298,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Meta Attrs: provides=something
Operations: monitor interval=60s (f4-monitor-interval-60s)
""")
-@@ -324,7 +324,7 @@
+@@ -328,7 +328,7 @@
output, returnVal = pcs(
temp_cib,
@@ -289,7 +307,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
)
ac(output, "")
self.assertEqual(0, returnVal)
-@@ -343,7 +343,7 @@
+@@ -347,7 +347,7 @@
Attributes: key=abc
Meta Attrs: provides=unfencing
Operations: monitor interval=60s (f3-monitor-interval-60s)
@@ -300,18 +318,43 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
""")
--- a/pcs/test/test_resource.py
+++ b/pcs/test/test_resource.py
-@@ -2471,7 +2471,7 @@
+@@ -2521,13 +2521,13 @@
+
def testLSBResource(self):
- output, returnVal = pcs(
- temp_cib,
-- "resource create --no-default-ops D2 lsb:network"
-+ "resource create --no-default-ops D2 lsb:networking"
+ self.assert_pcs_fail(
+- "resource create --no-default-ops D2 lsb:network foo=bar",
++ "resource create --no-default-ops D2 lsb:networking foo=bar",
+ "Error: invalid resource option 'foo', there are no options"
+ " allowed, use --force to override\n"
+ )
+
+ self.assert_pcs_success(
+- "resource create --no-default-ops D2 lsb:network foo=bar --force",
++ "resource create --no-default-ops D2 lsb:networking foo=bar --force",
+ "Warning: invalid resource option 'foo', there are no options"
+ " allowed\n"
)
- assert returnVal == 0
- assert output == "", [output]
+@@ -2536,7 +2536,7 @@
+ "resource show --full",
+ outdent(
+ """\
+- Resource: D2 (class=lsb type=network)
++ Resource: D2 (class=lsb type=networking)
+ Attributes: foo=bar
+ Operations: monitor interval=15 timeout=15 (D2-monitor-interval-15)
+ """
+@@ -2559,7 +2559,7 @@
+ "resource show --full",
+ outdent(
+ """\
+- Resource: D2 (class=lsb type=network)
++ Resource: D2 (class=lsb type=networking)
+ Attributes: foo=bar bar=baz
+ Operations: monitor interval=15 timeout=15 (D2-monitor-interval-15)
+ """
--- a/pcs/lib/test/test_resource_agent.py
+++ b/pcs/lib/test/test_resource_agent.py
-@@ -1434,7 +1434,7 @@
+@@ -1449,7 +1449,7 @@
)
self.mock_runner.run.assert_called_once_with(
@@ -320,7 +363,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
)
def test_failed_to_get_xml(self):
-@@ -1450,7 +1450,7 @@
+@@ -1465,7 +1465,7 @@
)
self.mock_runner.run.assert_called_once_with(
@@ -329,7 +372,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
)
def test_invalid_xml(self):
-@@ -1466,7 +1466,7 @@
+@@ -1481,7 +1481,7 @@
)
self.mock_runner.run.assert_called_once_with(
@@ -338,7 +381,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
)
-@@ -1787,7 +1787,7 @@
+@@ -1832,7 +1832,7 @@
}
),
mock.call(
diff --git a/debian/patches/0008-Replace-chkconfig.patch b/debian/patches/0008-Replace-chkconfig.patch
index ee1d55a..74d239e 100644
--- a/debian/patches/0008-Replace-chkconfig.patch
+++ b/debian/patches/0008-Replace-chkconfig.patch
@@ -7,7 +7,7 @@ Last-Update: 2016-11-13
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/pcsd/pcs.rb
+++ b/pcsd/pcs.rb
-@@ -2065,11 +2065,22 @@
+@@ -2068,11 +2068,22 @@
def is_service_enabled?(service)
if ISSYSTEMCTL
cmd = ['systemctl', 'is-enabled', "#{service}.service"]
@@ -33,7 +33,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
end
def is_service_running?(service)
-@@ -2084,12 +2095,13 @@
+@@ -2087,12 +2098,13 @@
def is_service_installed?(service)
unless ISSYSTEMCTL
@@ -49,7 +49,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
return true
end
}
-@@ -2119,7 +2131,7 @@
+@@ -2122,7 +2134,7 @@
cmd = ['systemctl', 'enable', "#{service}.service"]
else
# fails when the service is not installed
@@ -58,7 +58,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
end
_, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
return (retcode == 0)
-@@ -2134,7 +2146,7 @@
+@@ -2137,7 +2149,7 @@
if ISSYSTEMCTL
cmd = ['systemctl', 'disable', "#{service}.service"]
else
diff --git a/debian/patches/0009-Fix-python-lxml.patch b/debian/patches/0009-Fix-python-lxml.patch
index 1f43ad0..5cb11c4 100644
--- a/debian/patches/0009-Fix-python-lxml.patch
+++ b/debian/patches/0009-Fix-python-lxml.patch
@@ -7,7 +7,7 @@ Last-Update: 2017-01-06
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/pcs/test/tools/assertions.py
+++ b/pcs/test/tools/assertions.py
-@@ -19,7 +19,7 @@
+@@ -23,7 +23,7 @@
"""
msg = "Start tag expected, '<' not found, line 1, column 1"
if LXML_VERSION >= (3, 7, 0, 0):
--
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