Merge pull request #3821 from rednoah/master
Fix broken support GPG containers with embedded signatures
This commit is contained in:
commit
3cd5ae860f
@ -14,7 +14,7 @@ module Hbc
|
|||||||
|
|
||||||
def initialize(signature, parameters = {})
|
def initialize(signature, parameters = {})
|
||||||
@parameters = parameters
|
@parameters = parameters
|
||||||
@signature = URI(signature)
|
@signature = URI(signature) unless signature == :embedded
|
||||||
parameters.each do |hkey, hvalue|
|
parameters.each do |hkey, hvalue|
|
||||||
raise "invalid 'gpg' parameter: '#{hkey.inspect}'" unless VALID_PARAMETERS.include?(hkey)
|
raise "invalid 'gpg' parameter: '#{hkey.inspect}'" unless VALID_PARAMETERS.include?(hkey)
|
||||||
writer_method = "#{hkey}=".to_sym
|
writer_method = "#{hkey}=".to_sym
|
||||||
|
|||||||
@ -49,7 +49,7 @@ module Hbc
|
|||||||
end
|
end
|
||||||
|
|
||||||
def verify
|
def verify
|
||||||
return unless available?
|
return unless available? && cask.gpg.signature != :embedded
|
||||||
import_key
|
import_key
|
||||||
sig = fetch_sig
|
sig = fetch_sig
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user