From 25a36bcea4c02002d4895ba17f49ced09ae821c2 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Fri, 9 Jun 2017 21:34:23 +0200 Subject: 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. Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- meta/lib/oe/package_manager.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta') diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index f1b65bdbbc..caccd7baa9 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -647,7 +647,7 @@ class RpmPM(PackageManager): symlinks=True) def list_installed(self): - output = self._invoke_dnf(["repoquery", "--installed", "--queryformat", "Package: %{name} %{arch} %{version} %{sourcerpm}\nDependencies:\n%{requires}\nRecommendations:\n%{recommends}\nDependenciesEndHere:\n"], + output = self._invoke_dnf(["repoquery", "--installed", "--queryformat", "Package: %{name} %{arch} %{version} %{name}-%{version}-%{release}.%{arch}.rpm\nDependencies:\n%{requires}\nRecommendations:\n%{recommends}\nDependenciesEndHere:\n"], print_output = False) packages = {} current_package = None @@ -659,8 +659,8 @@ class RpmPM(PackageManager): current_package = package_info[0] package_arch = package_info[1] package_version = package_info[2] - package_srpm = package_info[3] - packages[current_package] = {"arch":package_arch, "ver":package_version, "filename":package_srpm} + package_rpm = package_info[3] + packages[current_package] = {"arch":package_arch, "ver":package_version, "filename":package_rpm} current_deps = [] elif line.startswith("Dependencies:"): current_state = "dependencies" -- cgit 1.2.3-korg