Merge pull request #4892 from scpeters/bottle_keep-old_root-url

dev-cmd/bottle: fix --keep-old with --root-url
This commit is contained in:
Mike McQuaid 2018-09-13 08:57:26 +01:00 committed by GitHub
commit 73e8bf68c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -448,7 +448,8 @@ module Homebrew
valid_key = %w[root_url prefix cellar rebuild sha1 sha256].include? key valid_key = %w[root_url prefix cellar rebuild sha1 sha256].include? key
next unless valid_key next unless valid_key
old_value = old_value_original.to_s.delete ":'\"" old_value = old_value_original.to_s.delete "'\""
old_value = old_value.to_s.delete ":" if key != "root_url"
tag = tag.to_s.delete ":" tag = tag.to_s.delete ":"
unless tag.empty? unless tag.empty?