From 009ee0c7e341194a9c2c730d584115a95ba973a4 Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Sat, 17 Feb 2024 15:45:24 +0000 Subject: Fix cleanup of noarch packages There were 2 bugs: - getting the architecture got broken due to a missing % - name of the binary package instead of the src was used, somethimes they are different --- modules/buildsystem/templates/cleaner.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/buildsystem/templates/cleaner.rb b/modules/buildsystem/templates/cleaner.rb index 88195e15..bc9a4aae 100755 --- a/modules/buildsystem/templates/cleaner.rb +++ b/modules/buildsystem/templates/cleaner.rb @@ -71,7 +71,7 @@ def process $noarch = {} # Get a list of all src.rpm and their build time - `urpmf --synthesis "#{src_path}/media_info/synthesis.hdlist.cz" --qf '%filename:%buildtime:buildarchs' "."`.each_line{|l| + `urpmf --synthesis "#{src_path}/media_info/synthesis.hdlist.cz" --qf '%filename:%buildtime:%buildarchs' "."`.each_line{|l| l2 = l.split(':') filename = l2[0] buildtime = l2[1].to_i @@ -199,7 +199,7 @@ def check_binaries(arch, srcs, srcages, src_path, path, used_srcs) used_srcs[src] = true if used_srcs != nil if filename =~ /noarch.rpm$/ then # We need to mark the src.rpm present on this arch only for full noarch packages - used_here_srcs[src] = true if $noarch[name_from_filename(filename)] + used_here_srcs[src] = true if $noarch[name_from_filename(src)] else used_here_srcs[src] = true end -- cgit v1.2.1