Skip to contentSkip to conversation

oe-pkgdata-util: Include colon when searching for variables

PATCH New Amanda Brindle 1 participant 2 messages Jan 23, 2018

lore
Share & tools
lore

Amanda Brindle

author
#0 lore raw

cover oe-pkgdata-util: Include colon when searching for variables

The following changes since commit 902b77bf91d96517b935bce00a11003604dc3d54:

lib/oe/package_manager/sdk: Ensure do_populate_sdk_ext and do_populate_sdk repos don't conflict (2018-01-22 10:39:10 +0000)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib abrindle/rprovides
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=abrindle/rprovides

Amanda Brindle (1):
oe-pkgdata-util: Include colon when searching for variables

 scripts/oe-pkgdata-util | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 1/1 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 <[email protected]>
---
 scripts/oe-pkgdata-util | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
scripts/oe-pkgdata-util +8 -8
index 040854f..78b3d7b 100755
@@ -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()
Signature · 1 line
2.7.4