aboutsummaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2017-06-09 21:34:23 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-12 15:17:50 +0100
commit25a36bcea4c02002d4895ba17f49ced09ae821c2 (patch)
tree93af061661273f900967e494986dfcb7e990e355 /meta
parentdf74b97599a789db742fc7588009783f5f37ebff (diff)
downloadopenembedded-core-contrib-25a36bcea4c02002d4895ba17f49ced09ae821c2.tar.gz
openembedded-core-contrib-25a36bcea4c02002d4895ba17f49ced09ae821c2.tar.bz2
openembedded-core-contrib-25a36bcea4c02002d4895ba17f49ced09ae821c2.zip
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 <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.py6
1 files changed, 3 insertions, 3 deletions
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"