pcp
[Top] [All Lists]

pmrep: drop pre-3.10.8 compat code

To: pcp developers <pcp@xxxxxxxxxxx>
Subject: pmrep: drop pre-3.10.8 compat code
From: Marko Myllynen <myllynen@xxxxxxxxxx>
Date: Mon, 18 Jan 2016 11:26:47 +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
pmrep: drop pre-3.10.8 compat code

---
 src/pmrep/pmrep.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/pmrep/pmrep.py b/src/pmrep/pmrep.py
index 40b3eec..34a8334 100644
--- a/src/pmrep/pmrep.py
+++ b/src/pmrep/pmrep.py
@@ -262,14 +262,10 @@ class PMReporter(object):
         if value in ('false', 'False', 'n', 'no', 'No'):
             value = 0
         if name == 'source':
-            try: # RHBZ#1270176 / PCP < 3.10.8
-                if '/' in value:
-                    self.opts.pmSetOptionArchive(value)
-                else:
-                    self.opts.pmSetOptionHost(value) # RHBZ#1289911
-            except:
-                sys.stderr.write("PCP 3.10.8 or later required for the 
'source' directive.\n")
-                sys.exit(1)
+            if '/' in value:
+                self.opts.pmSetOptionArchive(value)
+            else:
+                self.opts.pmSetOptionHost(value) # RHBZ#1289911
         elif name == 'samples':
             self.opts.pmSetOptionSamples(value)
             self.samples = self.opts.pmGetOptionSamples()

Thanks,

-- 
Marko Myllynen

<Prev in Thread] Current Thread [Next in Thread>
  • pmrep: drop pre-3.10.8 compat code, Marko Myllynen <=