bake-toolkit 2.37.4 → 2.37.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/bin/bakeqac +5 -4
  3. data/lib/common/version.rb +1 -1
  4. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f2fc87cc26ae238a746d4f4e720f2f3cb16eaafb
4
- data.tar.gz: 6850b504e99de92f8dbc38827ea744550976c650
3
+ metadata.gz: 6f3b4cee6c07be983597ace82ec90b63b61e88a1
4
+ data.tar.gz: 668982ce0264a542293ce4dbd7d82af17bed76ac
5
5
  SHA512:
6
- metadata.gz: eff7c972ae3accda1f0f2fe7269a34255b4cb7095f08a8fa9df697d69bf19c7a7242870527ae7334606660e1b7d062c2f6088434274c469f222ed0019742d9e7
7
- data.tar.gz: 530071a947009594168b167b757dbcc1ee3bf7c74ae47a1dc00de67f0bca649d6bb4218d099e911d54ba0dbe4a3ab4ea2a8f8722b35b80ddb2d1a6d61eb4e34e
6
+ metadata.gz: 163cf66d2afc08594ffcca8840505a7d99fc56a55db294d2ff98aa1a5558941bc0ddc014ea21f45a7749ca16f5d8d0dac0235c9d8638ba58b5d70ec65513b2cf
7
+ data.tar.gz: 7c4c93a9014a7e5405d01033500b6049f5eee52859c2e97dd7081be2eee5e0a57304ce92a22478cd39cb0ef78d360a44a6d2ec121bf450bc614544f4242ef9ab
data/bin/bakeqac CHANGED
@@ -35,7 +35,7 @@ def self.checkCipSize()
35
35
  return false
36
36
  end
37
37
 
38
- def self.executeQacli(cmd, adminStepAndImmediateOutput = false, cmdRemoveLocks = nil)
38
+ def self.executeQacli(cmd, adminStepAndImmediateOutput = false)
39
39
  timeStart = Time.now
40
40
  cSizeCheck = true
41
41
  licenseError = false
@@ -67,7 +67,8 @@ def self.executeQacli(cmd, adminStepAndImmediateOutput = false, cmdRemoveLocks =
67
67
  puts "bakeqac: Process takes too long!"
68
68
  processTimeout = true
69
69
  puts "bakeqac: Removing locks from #{@options.qacdata}..."
70
- successRemove, consoleOutput = ProcessHelper.run(cmdRemoveLocks, false)
70
+ sleep(1)
71
+ successRemove, consoleOutput = ProcessHelper.run($cmdRemoveLocks, false)
71
72
  puts consoleOutput unless consoleOutput.empty?
72
73
  break
73
74
  end
@@ -136,6 +137,7 @@ qaExe = [@options.qac_home+"/common/bin/qacli"]
136
137
  if @options.qacunittest
137
138
  qaExe = ["ruby", File.dirname(__FILE__)+"/../spec/bin/qactester.rb"]
138
139
  end
140
+ $cmdRemoveLocks = qaExe + ["admin", "--qaf-project", @options.qacdata, "--remove-locks"]
139
141
 
140
142
  ###### STEP 1: CREATE ######
141
143
 
@@ -148,8 +150,7 @@ end
148
150
 
149
151
  puts "bakeqac: creating database..."
150
152
 
151
- cmdRemoveLocks = qaExe + ["admin", "--qaf-project", @options.qacdata, "--remove-locks"]
152
- success, consoleOutput, checkError = executeQacli(cmd, true, cmdRemoveLocks)
153
+ success, consoleOutput, checkError = executeQacli(cmd, true)
153
154
 
154
155
  if success
155
156
  cctFilename = @options.qacdata+"/prqa/config/"+File.basename(@options.cct[0])
@@ -1,7 +1,7 @@
1
1
  module Bake
2
2
  class Version
3
3
  def self.number
4
- "2.37.4"
4
+ "2.37.5"
5
5
  end
6
6
 
7
7
  def self.printBakeVersion(ry = "")
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bake-toolkit
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.37.4
4
+ version: 2.37.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Alexander Schaal
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-05-29 00:00:00.000000000 Z
11
+ date: 2017-05-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rtext