Blame SOURCES/bz1346852-04-fix-detecting-nonexisting-resources-in-pcsd.patch
|
 |
15f218 |
From 2b843e7582ef3160a16094526727101180649448 Mon Sep 17 00:00:00 2001
|
|
|
15f218 |
From: Radek Steiger <rsteiger@redhat.com>
|
|
|
15f218 |
Date: Wed, 10 Aug 2016 09:56:28 +0200
|
|
|
15f218 |
Subject: [PATCH] fix detecting nonexisting resources in pcsd
|
|
|
15f218 |
|
|
|
15f218 |
---
|
|
|
15f218 |
pcsd/remote.rb | 2 +-
|
|
|
15f218 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
15f218 |
|
|
|
15f218 |
diff --git a/pcsd/remote.rb b/pcsd/remote.rb
|
|
|
15f218 |
index 134ac5d..e467d0a 100644
|
|
|
15f218 |
--- a/pcsd/remote.rb
|
|
|
15f218 |
+++ b/pcsd/remote.rb
|
|
|
15f218 |
@@ -1584,7 +1584,7 @@ def remove_resource(params, request, auth_user)
|
|
|
15f218 |
out, err, retval = run_cmd(user, *(cmd + [resource]))
|
|
|
15f218 |
if retval != 0
|
|
|
15f218 |
unless (
|
|
|
15f218 |
- (out + err).join('').include?(' does not exist.') and
|
|
|
15f218 |
+ (out + err).join('').include?('unable to find a resource') and
|
|
|
15f218 |
no_error_if_not_exists
|
|
|
15f218 |
)
|
|
|
15f218 |
errors += "Unable to stop resource '#{resource}': #{err.join('')}"
|
|
|
15f218 |
--
|
|
|
15f218 |
1.8.3.1
|
|
|
15f218 |
|