Archives/gitian-builder
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make gpg quiet by default, but not too quiet.

Browse Source
This commit is contained in:
Matt Corallo 2011-04-29 17:06:07 +02:00
parent 9096469e67
commit bc26667a56
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
bin/gverify
View File

@ -22,7 +22,7 @@ def sanitize_path(str, where)
end end
def info(str) def info(str)
puts str unless @options[:quiet] puts str if @options[:verbose]
end end
################################ ################################
@ -30,8 +30,8 @@ end
OptionParser.new do |opts| OptionParser.new do |opts|
opts.banner = "Usage: build [options] <build-description>.yml" opts.banner = "Usage: build [options] <build-description>.yml"
opts.on("-q", "--quiet", "be quiet") do |v| opts.on("-v", "--verbose", "be more verbose") do |v|
@options[:quiet] = v @options[:verbose] = v
end end
opts.on("-r REL", "--release REL", "release name") do |v| opts.on("-r REL", "--release REL", "release name") do |v|
@options[:release] = v @options[:release] = v
@ -90,11 +90,27 @@ Dir.foreach(release_path) do |signer_dir|
puts "#{signer_dir}: BAD SIGNATURE" puts "#{signer_dir}: BAD SIGNATURE"
did_fail = true did_fail = true
elsif current_manifest and result['out_manifest'] != current_manifest elsif current_manifest and result['out_manifest'] != current_manifest
info(out) out.each do |line|
if line =~ /^gpg: Signature made/
info(line)
elsif line =~ /^gpg: Good signature/
info(line)
else
puts line
end
end
puts "#{signer_dir}: MISMATCH" puts "#{signer_dir}: MISMATCH"
did_fail = true did_fail = true
else else
info(out) out.each do |line|
if line =~ /^gpg: Signature made/
info(line)
elsif line =~ /^gpg: Good signature/
info(line)
else
puts line
end
end
puts "#{signer_dir}: OK" puts "#{signer_dir}: OK"
end end
current_manifest = result['out_manifest'] current_manifest = result['out_manifest']