From 272cbd8165f25f6d713bc85097e259794b8cf70b Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Wed, 30 Sep 2020 17:57:37 +0000 Subject: Fix getting timestamp of non noarch packages urpmf --qf '%filename:%buildarchs:%buildtime' shifts fields when buildarchs is empty: python-sphinxcontrib-svg2pdfconverter-0.1.0-2.mga8.src.rpm:noarch:1564917727 python-argon2_cffi-19.1.0-1.mga8.src.rpm:1564918990: --- modules/buildsystem/templates/cleaner.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/buildsystem/templates/cleaner.rb b/modules/buildsystem/templates/cleaner.rb index 3c0c52d4..c1d89d7b 100755 --- a/modules/buildsystem/templates/cleaner.rb +++ b/modules/buildsystem/templates/cleaner.rb @@ -64,11 +64,11 @@ def process # Get a list of all src.rpm and their build time - `urpmf --synthesis "#{src_path}/media_info/synthesis.hdlist.cz" --qf '%filename:%buildarchs:%buildtime' "."`.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] - buildarch = l2[1] - buildtime = l2[2].to_i + buildtime = l2[1].to_i + buildarch = l2[2].rstrip name = name_from_filename(filename) $srcages[name] = [ filename, buildtime ] unless $srcages[name] && buildtime < $srcages[name][1] $srcs[filename] = true -- cgit v1.2.1