[Secure-testing-commits] r47794 - bin

[Chris Lamb]

Author: lamby
Date: 2017-01-06 20:26:15 +0000 (Fri, 06 Jan 2017)
New Revision: 47794

Modified:
   bin/tracker_data.py
Log:
Always strip whitespace from EOL

Modified: bin/tracker_data.py
===================================================================
--- bin/tracker_data.py	2017-01-06 20:26:13 UTC (rev 47793)
+++ bin/tracker_data.py	2017-01-06 20:26:15 UTC (rev 47794)
@@ -107,12 +107,14 @@
 
     @classmethod
     def parse_needed_file(self, inputfile):
-        PKG_RE = '^(\S+)(?:\s+\((.*)\)\s*)?$'
-        SEP_RE = '^--\s*$'
+        PKG_RE = '^(\S+)(?:\s+\((.*)\))?$'
+        SEP_RE = '^--$'
         state = 'LOOK_FOR_SEP'
         result = {}
         package = ''
         for line in inputfile:
+            # Always strip whitespace from end of line
+            line = line.rstrip()
             if state == 'LOOK_FOR_SEP':
                 res = re.match(SEP_RE, line)
                 if not res: