use a temporary folder for signing, to avoid concurrency

1 files changed, 5 insertions, 4 deletions

diff --git a/buildfile b/buildfile
index 76600ff..2dc2ae4 100644
--- a/buildfile
+++ b/buildfile
@@ -39,17 +39,18 @@ LAUNCHER="java -jar /shared/stp/platforms/releng/M7_34/org.eclipse.releng.basebu
 # This method may take a long time as signing works as a queue.
 def sign(artifact, output = artifact, send_email = true)
   puts "Start signing of #{artifact}"
-  File.makedirs SIGN_STAGING + "/signed"
+  signed_folder = File.basename artifact
+  File.makedirs SIGN_STAGING + "/signed_folder"
   system("cp #{artifact} #{SIGN_STAGING}")
   mail = send_email ? "mail" : "nomail"
-  puts %x[/usr/bin/sign #{SIGN_STAGING}/#{File.basename artifact} #{mail} #{SIGN_STAGING}/signed]
+  puts %x[/usr/bin/sign #{SIGN_STAGING}/#{File.basename artifact} #{mail} #{SIGN_STAGING}/#{signed_folder}]
 
-  while (!File.exist?"#{SIGN_STAGING}/signed/#{File.basename artifact}") 
+  while (!File.exist?"#{SIGN_STAGING}/#{signed_folder}/#{File.basename artifact}") 
     puts "Signing not complete. Waiting for 2 more minutes..."
     sleep 120
   end
   system("cp #{SIGN_STAGING}/signed/#{File.basename artifact} #{output}")
-  system "rm -rf #{SIGN_STAGING}/#{File.basename artifact} #{SIGN_STAGING}/signed"
+  system "rm -rf #{SIGN_STAGING}/#{File.basename artifact} #{SIGN_STAGING}/#{signed_folder}"
   puts "Done signing, copied final file here: #{output}" 
 end