diff options
author | Pascal Terjan <pterjan@mageia.org> | 2024-02-17 15:45:24 +0000 |
---|---|---|
committer | Pascal Terjan <pterjan@mageia.org> | 2024-02-17 16:02:09 +0000 |
commit | 009ee0c7e341194a9c2c730d584115a95ba973a4 (patch) | |
tree | efed899e106333c93939cbd79e1477adfb31234f /modules/buildsystem/templates | |
parent | 02fd2fc7b7e5177f8254b5333e709f4abbfd4dc9 (diff) | |
download | puppet-009ee0c7e341194a9c2c730d584115a95ba973a4.tar puppet-009ee0c7e341194a9c2c730d584115a95ba973a4.tar.gz puppet-009ee0c7e341194a9c2c730d584115a95ba973a4.tar.bz2 puppet-009ee0c7e341194a9c2c730d584115a95ba973a4.tar.xz puppet-009ee0c7e341194a9c2c730d584115a95ba973a4.zip |
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
Diffstat (limited to 'modules/buildsystem/templates')
-rwxr-xr-x | modules/buildsystem/templates/cleaner.rb | 4 |
1 files 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 |