Delete again non noarch packages

1 files changed, 5 insertions, 2 deletions

diff --git a/modules/buildsystem/templates/cleaner.rb b/modules/buildsystem/templates/cleaner.rb
index 5208be33..3c0c52d4 100755
--- a/modules/buildsystem/templates/cleaner.rb
+++ b/modules/buildsystem/templates/cleaner.rb
@@ -69,7 +69,7 @@ def process
     filename = l2[0]
     buildarch = l2[1]
     buildtime = l2[2].to_i
-    name = filename.sub(/-[^-]*-[^-]*$/, '')
+    name = name_from_filename(filename)
     $srcages[name] = [ filename, buildtime ] unless $srcages[name] && buildtime < $srcages[name][1]
     $srcs[filename] = true
     $noarch[name] = true if buildarch == 'noarch'
@@ -139,6 +139,8 @@ def check_binaries(srcs, srcages, path, used_srcs)
     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)]
+    else
+      used_here_srcs[src] = true
     end
   }
   old_binaries = []
@@ -149,7 +151,8 @@ def check_binaries(srcs, srcages, path, used_srcs)
     if ! srcs[src] then
       name = name_from_filename(filename)
       if srcages[name] then
-        # If the package was updated, only delete old binaries after 7d
+        # The src.rpm is gone but there is a different version of it
+        # Only delete old binaries after 7d
         next unless srcages[name][1] < Time.now.to_i - 24*60*60*7
         # Do not delete if the new version of the package hasn't been built for this arch yet
         next unless used_here_srcs[srcages[name][0]]