Fix packages being deleted too early during upload

1 files changed, 10 insertions, 4 deletions

diff --git a/modules/buildsystem/templates/cleaner.rb b/modules/buildsystem/templates/cleaner.rb
index d9457757..da13a8e8 100755
--- a/modules/buildsystem/templates/cleaner.rb
+++ b/modules/buildsystem/templates/cleaner.rb
@@ -121,8 +121,12 @@ end
 # - Mark used src.rpm (if one is never marked, the src.rpm is obsolete)
 
 def packages(path)
-  `urpmf --synthesis "#{path}/media_info/synthesis.hdlist.cz" --qf '%sourcerpm:%filename' ":"`.each_line{|l|
-    yield *(l.rstrip.split(':'))
+  `urpmf --synthesis "#{path}/media_info/synthesis.hdlist.cz" --qf '%sourcerpm:%filename:%buildtime' ":"`.each_line{|l|
+    l2 = l.split(':')
+    sourcerpm = l2[0]
+    filename = l2[1]
+    buildtime = l2[2].to_i
+    yield(sourcerpm, filename, buildtime)
   }
 end
 
@@ -133,7 +137,7 @@ end
 def check_binaries(srcs, srcages, path, used_srcs)
   used_here_srcs = {}
   all_versions = {}
-  packages(path) {|src, filename|
+  packages(path) {|src, filename, buildtime|
     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
@@ -149,7 +153,7 @@ def check_binaries(srcs, srcages, path, used_srcs)
     end
   }
   old_binaries = []
-  packages(path) {|src, filename|
+  packages(path) {|src, filename, buildtime|
     if ! srcs[src] then
       srcname = name_from_filename(src)
       if srcages[srcname] then
@@ -157,6 +161,8 @@ def check_binaries(srcs, srcages, path, used_srcs)
         # Only delete old binaries after 7d or if there is a new version
         name = name_from_filename(filename)
         next unless (srcages[srcname][1] < Time.now.to_i - 24*60*60*7 || all_versions[name].include?(src))
+        # Do not delete newer binaries, upload may be in progress
+        next unless buildtime < srcages[srcname][1]
         # Do not delete if the new version of the package hasn't been built for this arch yet
         next unless used_here_srcs[srcages[srcname][0]]
       end