diff options
| author | ilovezfs | 2016-07-07 13:00:40 -0700 | 
|---|---|---|
| committer | ilovezfs | 2016-07-07 13:00:40 -0700 | 
| commit | 454645263d3380dfa8d699bd1c42fa907076645f (patch) | |
| tree | 6d7b85b9a807c5c478771e70878ee4d38dfffb56 /Library/Homebrew/dev-cmd/linkage.rb | |
| parent | b35da247af6b0e6dedbaf0265e3d1e4a63563349 (diff) | |
| download | brew-454645263d3380dfa8d699bd1c42fa907076645f.tar.bz2 | |
Revert "linkage: check undeclared dependencies for `--test`"
This reverts commit 080ddd8804be14f4b18f9558b58270456ff313c2.
Diffstat (limited to 'Library/Homebrew/dev-cmd/linkage.rb')
| -rw-r--r-- | Library/Homebrew/dev-cmd/linkage.rb | 23 | 
1 files changed, 7 insertions, 16 deletions
diff --git a/Library/Homebrew/dev-cmd/linkage.rb b/Library/Homebrew/dev-cmd/linkage.rb index 37b18df24..078a3ea74 100644 --- a/Library/Homebrew/dev-cmd/linkage.rb +++ b/Library/Homebrew/dev-cmd/linkage.rb @@ -18,26 +18,27 @@ require "formula"  module Homebrew    def linkage +    found_broken_dylibs = false      ARGV.kegs.each do |keg|        ohai "Checking #{keg.name} linkage" if ARGV.kegs.size > 1        result = LinkageChecker.new(keg)        if ARGV.include?("--test")          result.display_test_output -        if result.broken_dylibs? || result.undeclared_deps? -          Homebrew.failed = true -        end        elsif ARGV.include?("--reverse")          result.display_reverse_output        else          result.display_normal_output        end +      found_broken_dylibs = true unless result.broken_dylibs.empty? +    end +    if ARGV.include?("--test") && found_broken_dylibs +      exit 1      end    end    class LinkageChecker      attr_reader :keg -    attr_reader :brewed_dylibs, :system_dylibs, :broken_dylibs, :variable_dylibs -    attr_reader :undeclared_deps, :reverse_links +    attr_reader :broken_dylibs      def initialize(keg)        @keg = keg @@ -45,7 +46,6 @@ module Homebrew        @system_dylibs = Set.new        @broken_dylibs = Set.new        @variable_dylibs = Set.new -      @undeclared_deps = []        @reverse_links = Hash.new { |h, k| h[k] = Set.new }        check_dylibs      end @@ -84,6 +84,7 @@ module Homebrew          @undeclared_deps -= [f.name]        rescue FormulaUnavailableError          opoo "Formula unavailable: #{keg.name}" +        @undeclared_deps = []        end      end @@ -111,16 +112,6 @@ module Homebrew      def display_test_output        display_items "Missing libraries", @broken_dylibs        puts "No broken dylib links" if @broken_dylibs.empty? -      display_items "Possible undeclared dependencies", @undeclared_deps -      puts "No undeclared dependencies" if @undeclared_deps.empty? -    end - -    def broken_dylibs? -      !@broken_dylibs.empty? -    end - -    def undeclared_deps? -      !@undeclared_deps.empty?      end      private  | 
