Check-in [0b1e588167]
Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Adding iteration as a settable field |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
0b1e5881676ef37c1ef8fb3e8347e0c3 |
| User & Date: | adam@opscode.com 2011-05-30 17:39:32 |
Context
|
2011-05-30
| ||
| 18:50 | Merge pull request #41 from adamhjk/ITERATION Adding iteration as a settable field check-in: d5bc442367 user: jls@semicomplete.com tags: trunk | |
| 17:39 | Adding iteration as a settable field check-in: 0b1e588167 user: adam@opscode.com tags: trunk | |
|
2011-05-20
| ||
| 19:40 | - version bump check-in: 7c2c71b78f user: jls@semicomplete.com tags: trunk | |
Changes
Changes to lib/fpm/builder.rb.
| ︙ | ︙ | |||
29 30 31 32 33 34 35 36 37 38 39 40 41 42 |
def initialize(settings, paths=[])
@working_dir = Dir.pwd
root = settings.chdir || '.'
paths = ['.'] if paths.empty?
@source = source_class_for(settings.source_type || 'dir').new(
paths, root,
:version => settings.version,
:epoch => settings.epoch,
:name => settings.package_name,
:prefix => settings.prefix,
:suffix => settings.suffix,
:exclude => settings.exclude,
:maintainer => settings.maintainer,
:provides => [],
| > | 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 |
def initialize(settings, paths=[])
@working_dir = Dir.pwd
root = settings.chdir || '.'
paths = ['.'] if paths.empty?
@source = source_class_for(settings.source_type || 'dir').new(
paths, root,
:version => settings.version,
:iteration => settings.iteration,
:epoch => settings.epoch,
:name => settings.package_name,
:prefix => settings.prefix,
:suffix => settings.suffix,
:exclude => settings.exclude,
:maintainer => settings.maintainer,
:provides => [],
|
| ︙ | ︙ |
Changes to lib/fpm/program.rb.
| ︙ | ︙ | |||
99 100 101 102 103 104 105 106 107 108 109 110 111 112 |
@settings.package_name = name
end # --name
opts.on("-v VERSION", "--version VERSION",
"version to give the package") do |version|
@settings.version = version
end # --version
opts.on("--epoch EPOCH",
"(optional) Set epoch value for this package.") do |epoch|
@settings.epoch = epoch
end # --epoch
opts.on("-d DEPENDENCY", "--depends DEPENDENCY") do |dep|
| > > > > > | 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 |
@settings.package_name = name
end # --name
opts.on("-v VERSION", "--version VERSION",
"version to give the package") do |version|
@settings.version = version
end # --version
opts.on("--iteration ITERATION",
"(optional) Set the iteration value for this package.") do |iteration|
@settings.iteration = iteration
end # --iteration
opts.on("--epoch EPOCH",
"(optional) Set epoch value for this package.") do |epoch|
@settings.epoch = epoch
end # --epoch
opts.on("-d DEPENDENCY", "--depends DEPENDENCY") do |dep|
|
| ︙ | ︙ |