Openembedded Core Discussions
 help / color / mirror / Atom feed
* [PATCH 0/1] oe-pkgdata-util: Include colon when searching for variables
@ 2018-01-23 20:42 Amanda Brindle
  2018-01-23 20:42 ` [PATCH 1/1] " Amanda Brindle
  0 siblings, 1 reply; 2+ messages in thread
From: Amanda Brindle @ 2018-01-23 20:42 UTC (permalink / raw)
  To: openembedded-core; +Cc: paul.eggleton, Amanda Brindle

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(-)

-- 
2.7.4



^ permalink raw reply	[flat|nested] 2+ messages in thread

* [PATCH 1/1] oe-pkgdata-util: Include colon when searching for variables
  2018-01-23 20:42 [PATCH 0/1] oe-pkgdata-util: Include colon when searching for variables Amanda Brindle
@ 2018-01-23 20:42 ` Amanda Brindle
  0 siblings, 0 replies; 2+ messages in thread
From: Amanda Brindle @ 2018-01-23 20:42 UTC (permalink / raw)
  To: openembedded-core; +Cc: paul.eggleton, Amanda Brindle

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>
---
 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()
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-01-23 20:45 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-23 20:42 [PATCH 0/1] oe-pkgdata-util: Include colon when searching for variables Amanda Brindle
2018-01-23 20:42 ` [PATCH 1/1] " Amanda Brindle

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox