]> code.ossystems Code Review - openembedded-core.git/commitdiff
oe-pkgdata-util: Include colon when searching for variables
authorAmanda Brindle <amanda.r.brindle@intel.com>
Tue, 23 Jan 2018 20:42:37 +0000 (12:42 -0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 29 Jan 2018 08:49:42 +0000 (08:49 +0000)
When searching for variables, include colon to ensure the script doesn't
find a variable that starts with the same name.

Signed-off-by: Amanda Brindle <amanda.r.brindle@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
scripts/oe-pkgdata-util

index 040854f644f30719464a50e52387726c92c3e8c6..78b3d7bcb836a020ceb8210d60330173aeaa4690 100755 (executable)
@@ -256,7 +256,7 @@ def lookup_recipe(args):
         with open(pkgdatafile, 'r') as f:
             found = False
             for line in f:
-                if line.startswith('PN'):
+                if line.startswith('PN:'):
                     print("%s" % line.split(':', 1)[1].strip())
                     found = True
                     break
@@ -292,19 +292,19 @@ def package_info(args):
             pe = ''
             pr = ''
             for line in f:
-                if line.startswith('PKGV'):
+                if line.startswith('PKGV:'):
                     pkg_version = line.split(':', 1)[1].strip()
-                elif line.startswith('PKGE'):
+                elif line.startswith('PKGE:'):
                     pkge = line.split(':', 1)[1].strip()
-                elif line.startswith('PKGR'):
+                elif line.startswith('PKGR:'):
                     pkgr = line.split(':', 1)[1].strip()
-                elif line.startswith('PN'):
+                elif line.startswith('PN:'):
                     recipe = line.split(':', 1)[1].strip()
-                elif line.startswith('PV'):
+                elif line.startswith('PV:'):
                     recipe_version = line.split(':', 1)[1].strip()
-                elif line.startswith('PE'):
+                elif line.startswith('PE:'):
                     pe = line.split(':', 1)[1].strip()
-                elif line.startswith('PR'):
+                elif line.startswith('PR:'):
                     pr = line.split(':', 1)[1].strip()
                 elif line.startswith('PKGSIZE'):
                     pkg_size = line.split(':', 1)[1].strip()