diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2017-08-29 23:20:58 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-31 17:57:11 +0100 |
commit | 01406f8bf69ade6370bcaebbfea4a8747758a152 (patch) | |
tree | eb0ee26d5df752fda3186dbeb1159e1fe303c580 /meta | |
parent | 80d0ce002e374772955659302735edf215e5327b (diff) | |
download | poky-01406f8bf69ade6370bcaebbfea4a8747758a152.tar.gz |
package_manager.py: Generate correct RPM package names again
During the transition to RPM4, the package names returned by
RpmPM.list_installed() changed from the expected names of the packages
that were installed into the image to some fictitious source RPM
names.
This restores the original functionality so that the
installed-packages.txt files produced by inheriting buildhistory yet
again contains a list of the names of the installed packages.
(From OE-Core rev: cd982d5b8944fe231c7dd38c9a563d0fc0737b88)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oe/package_manager.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 28c6b2aec2..518cf8dbe3 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py | |||
@@ -650,7 +650,7 @@ class RpmPM(PackageManager): | |||
650 | symlinks=True) | 650 | symlinks=True) |
651 | 651 | ||
652 | def list_installed(self): | 652 | def list_installed(self): |
653 | output = self._invoke_dnf(["repoquery", "--installed", "--queryformat", "Package: %{name} %{arch} %{version} %{sourcerpm}\nDependencies:\n%{requires}\nRecommendations:\n%{recommends}\nDependenciesEndHere:\n"], | 653 | output = self._invoke_dnf(["repoquery", "--installed", "--queryformat", "Package: %{name} %{arch} %{version} %{name}-%{version}-%{release}.%{arch}.rpm\nDependencies:\n%{requires}\nRecommendations:\n%{recommends}\nDependenciesEndHere:\n"], |
654 | print_output = False) | 654 | print_output = False) |
655 | packages = {} | 655 | packages = {} |
656 | current_package = None | 656 | current_package = None |
@@ -662,8 +662,8 @@ class RpmPM(PackageManager): | |||
662 | current_package = package_info[0] | 662 | current_package = package_info[0] |
663 | package_arch = package_info[1] | 663 | package_arch = package_info[1] |
664 | package_version = package_info[2] | 664 | package_version = package_info[2] |
665 | package_srpm = package_info[3] | 665 | package_rpm = package_info[3] |
666 | packages[current_package] = {"arch":package_arch, "ver":package_version, "filename":package_srpm} | 666 | packages[current_package] = {"arch":package_arch, "ver":package_version, "filename":package_rpm} |
667 | current_deps = [] | 667 | current_deps = [] |
668 | elif line.startswith("Dependencies:"): | 668 | elif line.startswith("Dependencies:"): |
669 | current_state = "dependencies" | 669 | current_state = "dependencies" |