diff options
| author | Mike McQuaid | 2016-08-18 17:32:35 +0100 | 
|---|---|---|
| committer | Mike McQuaid | 2016-08-18 17:32:35 +0100 | 
| commit | 27ecf588c703c49f2dfd89e269dfba2f7af5e670 (patch) | |
| tree | a199823b10854208ac646cb69e019116268258b4 /Library/Homebrew/software_spec.rb | |
| parent | 5c7c9de669025bbe4cad9829be39c5cf3b31ad25 (diff) | |
| download | brew-27ecf588c703c49f2dfd89e269dfba2f7af5e670.tar.bz2 | |
Rename bottle's revision to rebuild.
Diffstat (limited to 'Library/Homebrew/software_spec.rb')
| -rw-r--r-- | Library/Homebrew/software_spec.rb | 22 | 
1 files changed, 11 insertions, 11 deletions
| diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb index 10b6221de..84b94ce48 100644 --- a/Library/Homebrew/software_spec.rb +++ b/Library/Homebrew/software_spec.rb @@ -214,17 +214,17 @@ end  class Bottle    class Filename -    attr_reader :name, :version, :tag, :revision +    attr_reader :name, :version, :tag, :rebuild -    def self.create(formula, tag, revision) -      new(formula.name, formula.pkg_version, tag, revision) +    def self.create(formula, tag, rebuild) +      new(formula.name, formula.pkg_version, tag, rebuild)      end -    def initialize(name, version, tag, revision) +    def initialize(name, version, tag, rebuild)        @name = name        @version = version        @tag = tag -      @revision = revision +      @rebuild = rebuild      end      def to_s @@ -237,14 +237,14 @@ class Bottle      end      def suffix -      s = revision > 0 ? ".#{revision}" : "" +      s = rebuild > 0 ? ".#{rebuild}" : ""        ".bottle#{s}.tar.gz"      end    end    extend Forwardable -  attr_reader :name, :resource, :prefix, :cellar, :revision +  attr_reader :name, :resource, :prefix, :cellar, :rebuild    def_delegators :resource, :url, :fetch, :verify_download_integrity    def_delegators :resource, :cached_download, :clear_cache @@ -257,14 +257,14 @@ class Bottle      checksum, tag = spec.checksum_for(Utils::Bottles.tag) -    filename = Filename.create(formula, tag, spec.revision) +    filename = Filename.create(formula, tag, spec.rebuild)      @resource.url(build_url(spec.root_url, filename))      @resource.download_strategy = CurlBottleDownloadStrategy      @resource.version = formula.pkg_version      @resource.checksum = checksum      @prefix = spec.prefix      @cellar = spec.cellar -    @revision = spec.revision +    @rebuild = spec.rebuild    end    def compatible_cellar? @@ -292,12 +292,12 @@ class BottleSpecification    DEFAULT_CELLAR = "/usr/local/Cellar".freeze    DEFAULT_DOMAIN = (ENV["HOMEBREW_BOTTLE_DOMAIN"] || "https://homebrew.bintray.com").freeze -  attr_rw :prefix, :cellar, :revision +  attr_rw :prefix, :cellar, :rebuild    attr_accessor :tap    attr_reader :checksum, :collector    def initialize -    @revision = 0 +    @rebuild = 0      @prefix = DEFAULT_PREFIX      @cellar = DEFAULT_CELLAR      @collector = Utils::Bottles::Collector.new | 
