Skip to content

Commit

Permalink
Use "skip" instead of "remove" since that's what we're doing
Browse files Browse the repository at this point in the history
Signed-off-by: Tim Smith <tsmith@chef.io>
  • Loading branch information
tas50 committed Nov 24, 2020
1 parent 6b66cf1 commit 060a31a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/omnibus/packagers/pkg.rb
Original file line number Diff line number Diff line change
Expand Up @@ -423,15 +423,15 @@ def sign_binary(bin, hardened_runtime = false)
def is_binary?(bin)
return false unless File.file?(bin) && File.executable?(bin) && !File.symlink?(bin)

log.debug(log_key) { " removing non-binary file from signing: #{bin}" } unless is_binary
log.debug(log_key) { " skipping non-binary file from signing: #{bin}" } unless is_binary
true
end

def is_macho?(lib)
return false unless File.file?(bin) && File.executable?(bin) && !File.symlink?(bin)

if shellout!("file #{lib}").stdout.match?(/Mach-O.*(library|bundle)/) # https://rubular.com/r/nRgaQlAbkM9wHL
log.debug(log_key) { " removing non-Mach-O library file from signing: #{lib}" }
log.debug(log_key) { " skipping non-Mach-O library file from signing: #{lib}" }
return true
end

Expand Down

0 comments on commit 060a31a

Please sign in to comment.