pcp
[Top] [All Lists]

pmrep: drop RHBZ#1286733 compat

To: pcp developers <pcp@xxxxxxxxxxx>
Subject: pmrep: drop RHBZ#1286733 compat
From: Marko Myllynen <myllynen@xxxxxxxxxx>
Date: Mon, 18 Jan 2016 11:27:24 +0200
Delivered-to: pcp@xxxxxxxxxxx
Organization: Red Hat
Reply-to: Marko Myllynen <myllynen@xxxxxxxxxx>
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.0
RHBZ#1286733 has been fixed.

---
 src/pmrep/pmrep.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pmrep/pmrep.py b/src/pmrep/pmrep.py
index e04e23a..04b4799 100644
--- a/src/pmrep/pmrep.py
+++ b/src/pmrep/pmrep.py
@@ -638,8 +638,9 @@ class PMReporter(object):
                     except ValueError as error:
                         err = "Invalid syntax (expected metric=expression)"
                     except Exception as error:
-                        #err = self.context.pmDerivedErrStr() # RHBZ#1286733
-                        err = "Unknown reason"
+                        err = self.context.pmDerivedErrStr()
+                        if not err:
+                            err = "Unidentified error"
                     finally:
                         if err:
                             sys.stderr.write("Failed to register derived 
metric: %s.\n" % err)

Thanks,

-- 
Marko Myllynen

<Prev in Thread] Current Thread [Next in Thread>
  • pmrep: drop RHBZ#1286733 compat, Marko Myllynen <=