diff options
| author | Amanda Brindle <amanda.r.brindle@intel.com> | 2018-01-23 12:42:37 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-29 08:49:49 +0000 |
| commit | d48c2c6f38c2705e39f6478735721999ddd50fd7 (patch) | |
| tree | b0aec64985a51b8abe75636b53fa6fcf0a611e1b /scripts/oe-pkgdata-util | |
| parent | c391593402109944bacc6f75693a6d21adb0b071 (diff) | |
| download | poky-d48c2c6f38c2705e39f6478735721999ddd50fd7.tar.gz | |
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.
(From OE-Core rev: 3d2c87c4f4115b01534ab198c27682c7e4c5f31f)
Signed-off-by: Amanda Brindle <amanda.r.brindle@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/oe-pkgdata-util')
| -rwxr-xr-x | scripts/oe-pkgdata-util | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/oe-pkgdata-util b/scripts/oe-pkgdata-util index 040854f644..78b3d7bcb8 100755 --- a/scripts/oe-pkgdata-util +++ b/scripts/oe-pkgdata-util | |||
| @@ -256,7 +256,7 @@ def lookup_recipe(args): | |||
| 256 | with open(pkgdatafile, 'r') as f: | 256 | with open(pkgdatafile, 'r') as f: |
| 257 | found = False | 257 | found = False |
| 258 | for line in f: | 258 | for line in f: |
| 259 | if line.startswith('PN'): | 259 | if line.startswith('PN:'): |
| 260 | print("%s" % line.split(':', 1)[1].strip()) | 260 | print("%s" % line.split(':', 1)[1].strip()) |
| 261 | found = True | 261 | found = True |
| 262 | break | 262 | break |
| @@ -292,19 +292,19 @@ def package_info(args): | |||
| 292 | pe = '' | 292 | pe = '' |
| 293 | pr = '' | 293 | pr = '' |
| 294 | for line in f: | 294 | for line in f: |
| 295 | if line.startswith('PKGV'): | 295 | if line.startswith('PKGV:'): |
| 296 | pkg_version = line.split(':', 1)[1].strip() | 296 | pkg_version = line.split(':', 1)[1].strip() |
| 297 | elif line.startswith('PKGE'): | 297 | elif line.startswith('PKGE:'): |
| 298 | pkge = line.split(':', 1)[1].strip() | 298 | pkge = line.split(':', 1)[1].strip() |
| 299 | elif line.startswith('PKGR'): | 299 | elif line.startswith('PKGR:'): |
| 300 | pkgr = line.split(':', 1)[1].strip() | 300 | pkgr = line.split(':', 1)[1].strip() |
| 301 | elif line.startswith('PN'): | 301 | elif line.startswith('PN:'): |
| 302 | recipe = line.split(':', 1)[1].strip() | 302 | recipe = line.split(':', 1)[1].strip() |
| 303 | elif line.startswith('PV'): | 303 | elif line.startswith('PV:'): |
| 304 | recipe_version = line.split(':', 1)[1].strip() | 304 | recipe_version = line.split(':', 1)[1].strip() |
| 305 | elif line.startswith('PE'): | 305 | elif line.startswith('PE:'): |
| 306 | pe = line.split(':', 1)[1].strip() | 306 | pe = line.split(':', 1)[1].strip() |
| 307 | elif line.startswith('PR'): | 307 | elif line.startswith('PR:'): |
| 308 | pr = line.split(':', 1)[1].strip() | 308 | pr = line.split(':', 1)[1].strip() |
| 309 | elif line.startswith('PKGSIZE'): | 309 | elif line.startswith('PKGSIZE'): |
| 310 | pkg_size = line.split(':', 1)[1].strip() | 310 | pkg_size = line.split(':', 1)[1].strip() |
