[oe-commits] [openembedded-core] 03/31: oe-pkgdata-util: Include colon when searching for variables

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit cfdd4b25d59bca38db3982b6424ded022ec021d6
Author: Amanda Brindle <amanda.r.brindle at intel.com>
AuthorDate: Tue Jan 23 12:42:37 2018 -0800

    oe-pkgdata-util: Include colon when searching for variables
    
    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 at intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 scripts/oe-pkgdata-util | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/oe-pkgdata-util b/scripts/oe-pkgdata-util
index 040854f..78b3d7b 100755
--- a/scripts/oe-pkgdata-util
+++ b/scripts/oe-pkgdata-util
@@ -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()

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.