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

migrator: tap is a Tap object now

Browse Source
This commit is contained in:
Xu Cheng 2015-12-06 22:50:21 +08:00
parent c796198398
commit 571011ad59
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/migrator.rb
View File

@ -31,7 +31,7 @@ class Migrator
msg = if tap == "Homebrew/homebrew" msg = if tap == "Homebrew/homebrew"
"Please try to use #{formula.oldname} to refer the formula.\n" "Please try to use #{formula.oldname} to refer the formula.\n"
elsif tap elsif tap
"Please try to use fully-qualified #{Tap.fetch(*tap.split("/"))}/#{formula.oldname} to refer the formula.\n" "Please try to use fully-qualified #{tap}/#{formula.oldname} to refer the formula.\n"
end end
super <<-EOS.undent super <<-EOS.undent
@ -117,7 +117,7 @@ class Migrator
# Fix INSTALL_RECEIPTS for tap-migrated formula. # Fix INSTALL_RECEIPTS for tap-migrated formula.
def fix_tabs def fix_tabs
old_tabs.each do |tab| old_tabs.each do |tab|
tab.source["tap"] = formula.tap tab.tap = formula.tap
tab.write tab.write
end end
end end
@ -132,10 +132,10 @@ class Migrator
# newname's tap is the same as tap to which oldname migrated, then we # newname's tap is the same as tap to which oldname migrated, then we
# can perform migrations and the taps for oldname and newname are the same. # can perform migrations and the taps for oldname and newname are the same.
elsif TAP_MIGRATIONS && (rec = TAP_MIGRATIONS[formula.oldname]) \ elsif TAP_MIGRATIONS && (rec = TAP_MIGRATIONS[formula.oldname]) \
&& rec == formula.tap.sub("homebrew-", "") && old_tap == "Homebrew/homebrew" && formula.tap == rec && old_tap == "Homebrew/homebrew"
fix_tabs fix_tabs
true true
elsif formula.tap else
false false
end end
end end