admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Report correct conflicting tap

Browse Source 
Fixes:

$ brew tap adamv/alt
...blah blah blah..
$ brew tap josegonzalez/php
...blah blah blah...
Warning: Could not tap josegonzalez/php/php over mxcl/master/php

Where it should be "over adamv/alt/php".
This commit is contained in:
Max Howell 2012-03-17 01:23:53 +00:00
parent fe9e2be8fe
commit 5c2837c18c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Library/Homebrew/cmd/tap.rb
View File

@ -30,11 +30,11 @@ module Homebrew extend self
cd HOMEBREW_LIBRARY/"Formula" do cd HOMEBREW_LIBRARY/"Formula" do
formulae.each do |formula| formulae.each do |formula|
from = HOMEBREW_LIBRARY.join("Taps/#{formula}").tap_ref from = HOMEBREW_LIBRARY.join("Taps/#{formula}")
to = HOMEBREW_LIBRARY.join("Formula/#{formula.basename}").tap_ref to = HOMEBREW_LIBRARY.join("Formula/#{formula.basename}")
# Unexpected, but possible, lets proceed as if nothing happened # Unexpected, but possible, lets proceed as if nothing happened
formula.delete if from == to formula.delete if to.symlink? and to.realpath == from
# using the system ln is the only way to get relative symlinks # using the system ln is the only way to get relative symlinks
system "ln -s ../Taps/#{formula} 2>/dev/null" system "ln -s ../Taps/#{formula} 2>/dev/null"
@ -42,7 +42,8 @@ module Homebrew extend self
ignores << formula.basename.to_s ignores << formula.basename.to_s
tapped += 1 tapped += 1
else else
opoo "Could not tap #{Tty.white}#{from}#{Tty.reset} over #{Tty.white}#{to}#{Tty.reset}" to = to.realpath if to.exist?
opoo "Could not tap #{Tty.white}#{from.tap_ref}#{Tty.reset} over #{Tty.white}#{to.tap_ref}#{Tty.reset}"
end end
end end
end end