fpm 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9fb4eab81222c77d6790e9e06c8348744a020e7
-  data.tar.gz: a29942bc9fcc9dcbe6bf0f4d1fbfa431d202eb2b
+  metadata.gz: 36ac3bbe61d011df86f9193d4d8de4bdaab376a3
+  data.tar.gz: 5d9cc9c3b76c1cf50e68dac2a0b243d78a2c20e7
 SHA512:
-  metadata.gz: c97a69b63e17f684c7f481bda43e479d34a030e253b0a7294de356eaf1a35dc83b230deec5cf77270ff17756b98b8336016588be3ea41317ec354bd56649c1e8
-  data.tar.gz: a3708d970c1d1b6d4d384893f7c596b5fad2ea6d4eb01e0baa42bec1de3bbb85286f3d5acab9823928cf00bb04f59c98247d307269f04fe01bae824f387e59cf
+  metadata.gz: a662f62f9a816e90b34211cb6599917acc56a048e1b6c329fcbacd72aa94e12076397bbf0b1447718a0912dc3ffa44c2318b865746fafcf00f1ca95d2eb9a702
+  data.tar.gz: '0049a012969a0b8aa2eec1e54607b198fb7092eb63bd2704b9dbca1c51bae4776bb97d343a12f65bb5d42810cc4cc126dc9a38320a70f0db9c7f5f578bc4fee6'

data/CHANGELOG.rst

@@ -1,6 +1,11 @@
 Release Notes and Change Log
 ============================
 
+1.9.2 (July 29, 2017)
+^^^^^^^^^^^^^^^^^^^^^
+
+* rpm: Fix `--config-files` handling (`#1390`_, `#1391`_; Jordan Sissel)
+
 1.9.1 (July 28, 2017) happy sysadmin day!
 ^^^^^^^^^^^^^^^^^^^^^
 

data/lib/fpm/package/rpm.rb

@@ -474,11 +474,18 @@ class FPM::Package::RPM < FPM::Package
 
     # include external config files
     (attributes[:config_files] or []).each do |conf|
-      path = conf
-      dest_conf = File.join(staging_path, path)
-      FileUtils.mkdir_p(File.dirname(dest_conf))
-      FileUtils.cp_r conf, dest_conf
-      File.chmod(0755, dest_conf)
+      dest_conf = File.join(staging_path, conf)
+
+      if File.exist?(dest_conf)
+        logger.debug("Using --config-file from staging area", :path => conf)
+      elsif File.exist?(conf)
+        logger.info("Copying --config-file from local path", :path => conf)
+        FileUtils.mkdir_p(File.dirname(dest_conf))
+        FileUtils.cp_r conf, dest_conf
+      else
+        logger.error("Failed to find given --config-file", :path => conf)
+        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."
+      end
     end
 
     # scan all conf file paths for files and add them

data/lib/fpm/version.rb

@@ -1,3 +1,3 @@
 module FPM
-  VERSION = "1.9.1"
+  VERSION = "1.9.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors:
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2017-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json