naive implementation of rpm %attr directive

jordansissel · Jun 9, 2014 · 0063eb6 · clayne · Apr 22, 2015 · 0063eb6
1 parent ebcaf8a
commit 0063eb6
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/lib/fpm/command.rb b/lib/fpm/command.rb
@@ -346,6 +346,16 @@ def execute
     input.replaces += replaces
     input.config_files += config_files
     input.directories += directories
+
+    h = {}
+    attrs.each do | e |
+
+      s = e.split(':', 2)
+      h[s.last] = s.first
+    end
+
+    input.attrs = h
+
 
     script_errors = []
     setscript = proc do |scriptname|

diff --git a/lib/fpm/package.rb b/lib/fpm/package.rb
@@ -111,6 +111,8 @@ def to_s
   # This is where you'd put rpm, deb, or other specific attributes.
   attr_accessor :attributes
 
+  attr_accessor :attrs
+
   private
 
   def initialize
@@ -172,6 +174,7 @@ def initialize
     @scripts = {}
     @config_files = []
     @directories = []
+    @attrs = {}
 
     staging_path
     build_path
@@ -198,7 +201,7 @@ def convert(klass)
       :@architecture, :@category, :@config_files, :@conflicts,
       :@dependencies, :@description, :@epoch, :@iteration, :@license, :@maintainer,
       :@name, :@provides, :@replaces, :@scripts, :@url, :@vendor, :@version,
-      :@directories, :@staging_path
+      :@directories, :@staging_path, :@attrs
     ]
     ivars.each do |ivar|
       #@logger.debug("Copying ivar", :ivar => ivar, :value => instance_variable_get(ivar),

diff --git a/lib/fpm/package/rpm.rb b/lib/fpm/package/rpm.rb
@@ -95,6 +95,10 @@ class FPM::Package::RPM < FPM::Package
   option "--autoreq", :flag, "Enable RPM's AutoReq option"
   option "--autoprov", :flag, "Enable RPM's AutoProv option"
 
+  option "--attr", "ATTRFILE",
+    "Set the attribute for a file (%attr).",
+    :multivalued => true, :attribute_name => :attrs
+
   rpmbuild_filter_from_provides = []
   option "--filter-from-provides", "REGEX",
     "Set %filter_from_provides to the supplied REGEX." do |filter_from_provides|
@@ -131,7 +135,17 @@ def rpm_fix_name(name)
   def rpm_file_entry(file)
     original_file = file
     file = rpm_fix_name(file)
-    return file unless attributes[:rpm_use_file_permissions?]
+
+    if !attributes[:rpm_use_file_permissions?]
+
+      if attrs[file].nil?
+        return file
+      else
+        return sprintf("%%attr(%s) %s\n", attrs[file], file)
+      end
+    end
+
+    return sprintf("%%attr(%s) %s\n", attrs[file], file) unless attrs[file].nil?
 
     # Stat the original filename in the relative staging path
     ::Dir.chdir(staging_path) do