|
|
|
|
@ -117,12 +117,20 @@ class MockManager
|
|
|
|
|
bld_id = @build_id.to_i
|
|
|
|
|
bld_str = "%010d" % bld_id
|
|
|
|
|
dt_str = dt.strftime("%Y%m%d_#{bld_str}")
|
|
|
|
|
cmd_args = %Q(/usr/bin/rpm -q --specfile #{spec_file} --queryformat "%{RELEASE}")
|
|
|
|
|
cmd_args = %Q(/usr/bin/rpm -q --specfile #{spec_file} --queryformat "%{RELEASE}\n" 2>/dev/null)
|
|
|
|
|
@log.debug(cmd_args)
|
|
|
|
|
cmd = Runner.new(cmd_args, @log)
|
|
|
|
|
cmd.run
|
|
|
|
|
if cmd.exit_status == 0
|
|
|
|
|
res = "#{cmd.stdout}.#{dt_str}"
|
|
|
|
|
versions = "#{cmd.stdout}".split("\n")
|
|
|
|
|
if versions.length()>0
|
|
|
|
|
res = versions[0].strip
|
|
|
|
|
res = "#{res}.#{dt_str}"
|
|
|
|
|
else
|
|
|
|
|
res = cmd.stdout.strip
|
|
|
|
|
res = "#{res}.#{dt_str}"
|
|
|
|
|
end
|
|
|
|
|
line_array = []
|
|
|
|
|
File.readlines(spec_file).each do |line|
|
|
|
|
|
if line =~ /^[\t ]*[Rr]elease:/
|
|
|
|
|
|