pmrep: fix cmd line options handling

[Marko Myllynen <myllynen@xxxxxxxxxx>]

The easiest solution seems to work.

---
 src/pmrep/TODO     |  1 -
 src/pmrep/pmrep.py | 15 ++-------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/pmrep/TODO b/src/pmrep/TODO
index e01d233..ea9c9d2 100644
--- a/src/pmrep/TODO
+++ b/src/pmrep/TODO
@@ -1,6 +1,5 @@
 -  after first release: drop all compat code
 -  after first release: check all code marked with BZ references
--  fix get_cmd_line_metrics
 -  allow defining instances to display
 -  opt to write cols per row with stdout output
 -  adjust unit/scale handling to ~match fetchgroup
diff --git a/src/pmrep/pmrep.py b/src/pmrep/pmrep.py
index 80161b6..f935617 100644
--- a/src/pmrep/pmrep.py
+++ b/src/pmrep/pmrep.py
@@ -418,19 +418,8 @@ class PMReporter(object):
 
     def get_cmd_line_metrics(self):
         """ Get metric set specifications from the command line """
-        metrics = []
-        for arg in sys.argv[1:]:
-            if arg in self.arghelp:
-                return 0
-        for arg in reversed(sys.argv[1:]):
-            if arg.startswith('-'):
-                if len(metrics):
-                    if arg not in self.argless and '=' not in arg:
-                        del metrics[-1]
-                break
-            metrics.append(arg)
-        metrics.reverse()
-        return metrics
+        pmapi.c_api.pmGetOptionsFromList(sys.argv) # RHBZ#1287778
+        return self.opts.pmNonOptionsFromList(sys.argv)
 
     def parse_metric_info(self, metrics, key, value):
         """ Parse metric information """

Thanks,

-- 
Marko Myllynen