diff options
author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2014-02-19 12:40:24 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-20 14:28:10 +0000 |
commit | 1988f7186bd0b502172bf32b2c7c75cdc8b37a4e (patch) | |
tree | 11bb3f94d0c3f65f658575c881b0ad9fddd4a3ea /meta/lib | |
parent | 84210fd82824e5136b75c71bdc5eed0f33b0cdb9 (diff) | |
download | poky-1988f7186bd0b502172bf32b2c7c75cdc8b37a4e.tar.gz |
package_manager.py: fix installed package list creation for Opkg/Dpkg
Small error in the package list creation routine. Buildhistory was
supposed to use this but was never called. Hence, it escaped tests...
(From OE-Core rev: eaa1994ad22730cec8e8c57736915da6b45a416e)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
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/package_manager.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 6dc8fbd9e4..a3c0a8eb30 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py | |||
@@ -1134,7 +1134,8 @@ class OpkgPM(PackageManager): | |||
1134 | 1134 | ||
1135 | if format == "file": | 1135 | if format == "file": |
1136 | tmp_output = "" | 1136 | tmp_output = "" |
1137 | for pkg, pkg_file, pkg_arch in tuple(output.split('\n')): | 1137 | for line in output.split('\n'): |
1138 | pkg, pkg_file, pkg_arch = line.split() | ||
1138 | full_path = os.path.join(self.deploy_dir, pkg_arch, pkg_file) | 1139 | full_path = os.path.join(self.deploy_dir, pkg_arch, pkg_file) |
1139 | if os.path.exists(full_path): | 1140 | if os.path.exists(full_path): |
1140 | tmp_output += "%s %s %s\n" % (pkg, full_path, pkg_arch) | 1141 | tmp_output += "%s %s %s\n" % (pkg, full_path, pkg_arch) |
@@ -1435,7 +1436,8 @@ class DpkgPM(PackageManager): | |||
1435 | 1436 | ||
1436 | if format == "file": | 1437 | if format == "file": |
1437 | tmp_output = "" | 1438 | tmp_output = "" |
1438 | for pkg, pkg_file, pkg_arch in tuple(output.split('\n')): | 1439 | for line in tuple(output.split('\n')): |
1440 | pkg, pkg_file, pkg_arch = line.split() | ||
1439 | full_path = os.path.join(self.deploy_dir, pkg_arch, pkg_file) | 1441 | full_path = os.path.join(self.deploy_dir, pkg_arch, pkg_file) |
1440 | if os.path.exists(full_path): | 1442 | if os.path.exists(full_path): |
1441 | tmp_output += "%s %s %s\n" % (pkg, full_path, pkg_arch) | 1443 | tmp_output += "%s %s %s\n" % (pkg, full_path, pkg_arch) |