diff options
author | Saul Wold <sgw@linux.intel.com> | 2011-09-20 13:40:48 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-21 13:42:50 +0100 |
commit | efc88ff0108e15b464c849a061406783c1fb0a39 (patch) | |
tree | b1f1dea57a44f67d3b2bfcd93ed6ca4b1fd00da1 /meta/lib | |
parent | c2db80b4de0fea9666e2dbe834de2c0771a47b9e (diff) | |
download | poky-efc88ff0108e15b464c849a061406783c1fb0a39.tar.gz |
distrodata: fix distro_check code
This fixes a problem with package names from inherits showing up
(From OE-Core rev: edb2a11994ac21e790155ea519bded4b37ef9307)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oe/distro_check.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/lib/oe/distro_check.py b/meta/lib/oe/distro_check.py index 55cdcad461..4721355bd8 100644 --- a/meta/lib/oe/distro_check.py +++ b/meta/lib/oe/distro_check.py | |||
@@ -73,9 +73,9 @@ def clean_package_list(package_list): | |||
73 | def get_latest_released_meego_source_package_list(): | 73 | def get_latest_released_meego_source_package_list(): |
74 | "Returns list of all the name os packages in the latest meego distro" | 74 | "Returns list of all the name os packages in the latest meego distro" |
75 | 75 | ||
76 | if not os.path.isfile("/tmp/Meego-1.0"): | 76 | if not os.path.isfile("/tmp/Meego-1.1"): |
77 | os.mknod("/tmp/Meego-1.0") | 77 | os.mknod("/tmp/Meego-1.1") |
78 | f = open("/tmp/Meego-1.0", "r") | 78 | f = open("/tmp/Meego-1.1", "r") |
79 | package_names = [] | 79 | package_names = [] |
80 | for line in f: | 80 | for line in f: |
81 | package_names.append(line[:-1] + ":" + "main") # Also strip the '\n' at the end | 81 | package_names.append(line[:-1] + ":" + "main") # Also strip the '\n' at the end |
@@ -303,7 +303,7 @@ def compare_in_distro_packages_list(distro_check_dir, d): | |||
303 | bb.note("Recipe: %s" % recipe_name) | 303 | bb.note("Recipe: %s" % recipe_name) |
304 | tmp = bb.data.getVar('DISTRO_PN_ALIAS', localdata, True) | 304 | tmp = bb.data.getVar('DISTRO_PN_ALIAS', localdata, True) |
305 | 305 | ||
306 | distro_exceptions = dict({"OE-Core":'OE-Core', "OpenedHand":'OpenedHand', "Intel":'Intel', "Upstream":'Upstream', "WindRiver":'Windriver', "OSPDT":'OSPDT Approved', "Poky":'poky'}) | 306 | distro_exceptions = dict({"OE-Core":'OE-Core', "OpenedHand":'OpenedHand', "Intel":'Intel', "Upstream":'Upstream', "Windriver":'Windriver', "OSPDT":'OSPDT Approved', "Poky":'poky'}) |
307 | 307 | ||
308 | if tmp: | 308 | if tmp: |
309 | list = tmp.split(' ') | 309 | list = tmp.split(' ') |