bake-toolkit 2.37.5 → 2.37.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f3b4cee6c07be983597ace82ec90b63b61e88a1
-  data.tar.gz: 668982ce0264a542293ce4dbd7d82af17bed76ac
+  metadata.gz: 44a4376dcaeacdba3b5a9fbb5ff2c0d9f9a2ae81
+  data.tar.gz: d71e27eae209295de653c1f3b1fbf708301edb4b
 SHA512:
-  metadata.gz: 163cf66d2afc08594ffcca8840505a7d99fc56a55db294d2ff98aa1a5558941bc0ddc014ea21f45a7749ca16f5d8d0dac0235c9d8638ba58b5d70ec65513b2cf
-  data.tar.gz: 7c4c93a9014a7e5405d01033500b6049f5eee52859c2e97dd7081be2eee5e0a57304ce92a22478cd39cb0ef78d360a44a6d2ec121bf450bc614544f4242ef9ab
+  metadata.gz: 58f8ca280be6830ff4b466b8c4c60d23cee430b7ca22d4aa7e2b37f071e601d6647f6e167eb61405632bf43a5877b814c47ec93294c49aec3c041ade925ccfcd
+  data.tar.gz: 16e12e4a3263484082c9432c64bed7cb74f684052cc6abd77ad35a33042d8598b4b27f4a9207ab49ddf63d594dc8f3e541382a6ec62792473fae83b854db7965

data/bin/bakeqac

@@ -46,6 +46,7 @@ def self.executeQacli(cmd, adminStepAndImmediateOutput = false)
 
   loop do
     FileUtils.rm_rf @options.qacdata if adminStepAndImmediateOutput
+
     # admin step should not take longer than 60 seconds, rest not longer than 80% of qacretry time if specified
     success, consoleOutput = ProcessHelper.run(cmd, adminStepAndImmediateOutput, true, nil, [0], Dir.pwd, adminStepAndImmediateOutput ? 60 : (@options.qacretry * 0.8).to_i)
     licenseError = false
@@ -63,17 +64,18 @@ def self.executeQacli(cmd, adminStepAndImmediateOutput = false)
         puts "bakeqac: Unable to connect to QAX Daemon!"
         break
       end
-      if (line.include?("Process timeout"))
-        puts "bakeqac: Process takes too long!"
+      if (line.include?("Process timeout") || line.include?("A mutually exclusive operation is in progress"))
+        puts line
+        puts "Seconds left after killing process: %d" % (@options.qacretry - (Time.now - timeStart))
         processTimeout = true
         puts "bakeqac: Removing locks from #{@options.qacdata}..."
         sleep(1)
         successRemove, consoleOutput = ProcessHelper.run($cmdRemoveLocks, false)
+        puts "Seconds left after removing locks: %d" % (@options.qacretry - (Time.now - timeStart))
         puts consoleOutput unless consoleOutput.empty?
         break
       end
     end
-
     cSizeCheck = checkCipSize()
 
     break unless ((@options.qacretry >= (Time.now - timeStart)) && (!cSizeCheck || licenseError || qacDaemonError || processTimeout))

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.37.5"
+      "2.37.6"
     end
 
     def self.printBakeVersion(ry = "")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.37.5
+  version: 2.37.6
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext