Re: [Freeipa-devel] [PATCH] 0001 Fix ipa-client-install --uninstall crash

2014-07-08 Thread David Kupka 


On 07/07/2014 09:15 PM, Petr Viktorin wrote:

On 07/04/2014 08:47 AM, David Kupka wrote:

https://fedorahosted.org/freeipa/ticket/4273

David Kupka


Hi,
This works fine. Just two nitpicks in the log message:
- %s means convert to string, so the str() is redundant
- the logger methods take items to interpolate as arguments, instead 
of one string built with %.


So you'll want:
root_logger.error('Failed to start chronyd: %s', e)



Hi,
thanks for comments. I've fixed the patch accordingly.

--
David Kupka

From 8f51cc43f11485568814ea6937c941a07d5a9e37 Mon Sep 17 00:00:00 2001
From: David Kupka dku...@redhat.com
Date: Tue, 8 Jul 2014 07:36:48 +0200
Subject: [PATCH] Fix ipa-client-install --uninstall crash

Fix ipa-client-install crash when chronyd service fails to start.

https://fedorahosted.org/freeipa/ticket/4273
---
 ipa-client/ipa-install/ipa-client-install | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index bfa43b1468887dcd408cd8f2941f9fd961f372ce..617db26f499106fa10665af3ca9d9f2736ba9b00 100755
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -692,7 +692,10 @@ def uninstall(options, env):
if restored:
services.knownservices.ntpd.restart()
 
-ipaclient.ntpconf.restore_forced_ntpd(statestore)
+try:
+ipaclient.ntpconf.restore_forced_ntpd(statestore)
+except CalledProcessError, e:
+root_logger.error('Failed to start chronyd: %s', e)
 
 if was_sshd_configured and services.knownservices.sshd.is_running():
 services.knownservices.sshd.restart()
-- 
1.9.3

___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

Re: [Freeipa-devel] [PATCH] 0001 Fix ipa-client-install --uninstall crash

2014-07-08 Thread Petr Viktorin 

On 07/08/2014 07:59 AM, David Kupka wrote:


On 07/07/2014 09:15 PM, Petr Viktorin wrote:

On 07/04/2014 08:47 AM, David Kupka wrote:

https://fedorahosted.org/freeipa/ticket/4273

David Kupka


Hi,
This works fine. Just two nitpicks in the log message:
- %s means convert to string, so the str() is redundant
- the logger methods take items to interpolate as arguments, instead
of one string built with %.

So you'll want:
root_logger.error('Failed to start chronyd: %s', e)


Sorry for not replying to list.


Hi,
thanks for comments. I've fixed the patch accordingly.


Thanks!
ACK, pushed to:
master: 2ff14607b170c86ccd93cff60f5a34d64cd1e419
ipa-4-1: 2ff14607b170c86ccd93cff60f5a34d64cd1e419
ipa-4-0: 2ff14607b170c86ccd93cff60f5a34d64cd1e419


--
Petr³

___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

[Freeipa-devel] [PATCH] 0001 Fix ipa-client-install --uninstall crash

2014-07-04 Thread David Kupka 

https://fedorahosted.org/freeipa/ticket/4273

David Kupka
From b9a2b18accf3dd41304d244b00aeeb4887d72784 Mon Sep 17 00:00:00 2001
From: David Kupka dku...@redhat.com
Date: Fri, 4 Jul 2014 08:26:23 +0200
Subject: [PATCH] Fix ipa-client-install --uninstall crash

Fix ipa-client-install crash when chronyd service fails to start.

https://fedorahosted.org/freeipa/ticket/4273
---
 ipa-client/ipa-install/ipa-client-install | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index bfa43b1468887dcd408cd8f2941f9fd961f372ce..de55b1d2bf230c6819d09656f8905735a1ff8ad7 100755
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -692,7 +692,10 @@ def uninstall(options, env):
if restored:
services.knownservices.ntpd.restart()
 
-ipaclient.ntpconf.restore_forced_ntpd(statestore)
+try:
+ipaclient.ntpconf.restore_forced_ntpd(statestore)
+except CalledProcessError, e:
+root_logger.error('Failed to start chronyd: %s' % str(e))
 
 if was_sshd_configured and services.knownservices.sshd.is_running():
 services.knownservices.sshd.restart()
-- 
1.9.0

___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel