fpm 1.9.1 → 1.9.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.rst +5 -0
- data/lib/fpm/package/rpm.rb +12 -5
- data/lib/fpm/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 36ac3bbe61d011df86f9193d4d8de4bdaab376a3
|
|
4
|
+
data.tar.gz: 5d9cc9c3b76c1cf50e68dac2a0b243d78a2c20e7
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a662f62f9a816e90b34211cb6599917acc56a048e1b6c329fcbacd72aa94e12076397bbf0b1447718a0912dc3ffa44c2318b865746fafcf00f1ca95d2eb9a702
|
|
7
|
+
data.tar.gz: '0049a012969a0b8aa2eec1e54607b198fb7092eb63bd2704b9dbca1c51bae4776bb97d343a12f65bb5d42810cc4cc126dc9a38320a70f0db9c7f5f578bc4fee6'
|
data/CHANGELOG.rst
CHANGED
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
Release Notes and Change Log
|
|
2
2
|
============================
|
|
3
3
|
|
|
4
|
+
1.9.2 (July 29, 2017)
|
|
5
|
+
^^^^^^^^^^^^^^^^^^^^^
|
|
6
|
+
|
|
7
|
+
* rpm: Fix `--config-files` handling (`#1390`_, `#1391`_; Jordan Sissel)
|
|
8
|
+
|
|
4
9
|
1.9.1 (July 28, 2017) happy sysadmin day!
|
|
5
10
|
^^^^^^^^^^^^^^^^^^^^^
|
|
6
11
|
|
data/lib/fpm/package/rpm.rb
CHANGED
|
@@ -474,11 +474,18 @@ class FPM::Package::RPM < FPM::Package
|
|
|
474
474
|
|
|
475
475
|
# include external config files
|
|
476
476
|
(attributes[:config_files] or []).each do |conf|
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
|
|
481
|
-
File.
|
|
477
|
+
dest_conf = File.join(staging_path, conf)
|
|
478
|
+
|
|
479
|
+
if File.exist?(dest_conf)
|
|
480
|
+
logger.debug("Using --config-file from staging area", :path => conf)
|
|
481
|
+
elsif File.exist?(conf)
|
|
482
|
+
logger.info("Copying --config-file from local path", :path => conf)
|
|
483
|
+
FileUtils.mkdir_p(File.dirname(dest_conf))
|
|
484
|
+
FileUtils.cp_r conf, dest_conf
|
|
485
|
+
else
|
|
486
|
+
logger.error("Failed to find given --config-file", :path => conf)
|
|
487
|
+
raise "Could not find config file '#{conf}' in staging area or on host. This can happen if you specify `--config-file '#{conf}'` but this file does not exist in the source package and also does not exist in filesystem."
|
|
488
|
+
end
|
|
482
489
|
end
|
|
483
490
|
|
|
484
491
|
# scan all conf file paths for files and add them
|
data/lib/fpm/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: fpm
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.9.
|
|
4
|
+
version: 1.9.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Jordan Sissel
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-07-
|
|
11
|
+
date: 2017-07-29 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: json
|