summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross@burtonini.com>2021-01-22 12:52:05 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-01-23 17:08:54 +0000
commitbca05547e2f10b52cc073c37770ffdd9a3f6e37f (patch)
tree643ac0dd23df33e749adb2ed7ba1f1ae6dbf4240
parent21e70c8a7213fae25a38ff7e4a8316a42130d24f (diff)
downloadpoky-bca05547e2f10b52cc073c37770ffdd9a3f6e37f.tar.gz
lib/oe/package_manager: ensure repodata is wiped
When building package indexes for RPM feeds, delete repodata first to be absolutely sure that the indexes are up to date. We've seen some mysterious failures where the repodata doesn't match the repository, so hopefully this will stop that happening. [ YOCTO #14190 ] (From OE-Core rev: 88cd40c08109bf732934fa4c8d602c701c1eb2a0) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/package_manager/rpm/__init__.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/lib/oe/package_manager/rpm/__init__.py b/meta/lib/oe/package_manager/rpm/__init__.py
index 898184442f..6df0092281 100644
--- a/meta/lib/oe/package_manager/rpm/__init__.py
+++ b/meta/lib/oe/package_manager/rpm/__init__.py
@@ -33,6 +33,9 @@ class RpmIndexer(Indexer):
33class RpmSubdirIndexer(RpmIndexer): 33class RpmSubdirIndexer(RpmIndexer):
34 def write_index(self): 34 def write_index(self):
35 bb.note("Generating package index for %s" %(self.deploy_dir)) 35 bb.note("Generating package index for %s" %(self.deploy_dir))
36 # Remove the existing repodata to ensure that we re-generate it no matter what
37 bb.utils.remove(os.path.join(self.deploy_dir, "repodata"), recurse=True)
38
36 self.do_write_index(self.deploy_dir) 39 self.do_write_index(self.deploy_dir)
37 for entry in os.walk(self.deploy_dir): 40 for entry in os.walk(self.deploy_dir):
38 if os.path.samefile(self.deploy_dir, entry[0]): 41 if os.path.samefile(self.deploy_dir, entry[0]):