From eea684e2a731c1bdb6881dbdb72359a94d925253 Mon Sep 17 00:00:00 2001 From: Timo Aaltonen Date: Fri, 17 Feb 2017 01:40:24 +0200 Subject: [PATCH] fix-is-running.diff: Add a third argument to is_running() in ipaplatform/debian/services.py. --- debian/changelog | 7 +++++++ debian/patches/fix-is-running.diff | 11 +++++++++++ debian/patches/series | 1 + 3 files changed, 19 insertions(+) create mode 100644 debian/patches/fix-is-running.diff diff --git a/debian/changelog b/debian/changelog index 69ad0d5b7..6b07b0478 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +freeipa (4.4.3-4) UNRELEASED; urgency=medium + + * fix-is-running.diff: Add a third argument to is_running() in + ipaplatform/debian/services.py. + + -- Timo Aaltonen Fri, 17 Feb 2017 01:40:15 +0200 + freeipa (4.4.3-3) experimental; urgency=medium * client.postinst: Fix logfile location. diff --git a/debian/patches/fix-is-running.diff b/debian/patches/fix-is-running.diff new file mode 100644 index 000000000..ca1cd97f3 --- /dev/null +++ b/debian/patches/fix-is-running.diff @@ -0,0 +1,11 @@ +--- a/ipaplatform/debian/services.py ++++ b/ipaplatform/debian/services.py +@@ -96,7 +96,7 @@ class DebianSysvService(base_services.Pl + if wait and self.is_running(instance_name): + self.__wait_for_open_ports(instance_name) + +- def is_running(self, instance_name=""): ++ def is_running(self, instance_name="", wait=True): + ret = True + try: + result = ipautil.run([paths.SBIN_SERVICE, diff --git a/debian/patches/series b/debian/patches/series index fd4f18111..3603ffe41 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -19,3 +19,4 @@ fix-memcached.diff fix-oddjobs.diff purge-firefox-extension.diff fix-ipa-otpd-service.diff +fix-is-running.diff