Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add --rpm-auto-add-exclude-directories option #640

Merged
merged 1 commit into from
Mar 7, 2014
Merged

Add --rpm-auto-add-exclude-directories option #640

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions lib/fpm/package/rpm.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@ class FPM::Package::RPM < FPM::Package
option "--sign", :flag, "Pass --sign to rpmbuild"

option "--auto-add-directories", :flag, "Auto add directories not part of filesystem"
option "--auto-add-exclude-directories", "DIRECTORIES",
"Additional directories ignored by '--rpm-auto-add-directories' flag",
:multivalued => true, :attribute_name => :auto_add_exclude_directories

option "--autoreqprov", :flag, "Enable RPM's AutoReqProv option"
option "--autoreq", :flag, "Enable RPM's AutoReq option"
Expand Down Expand Up @@ -324,6 +327,7 @@ def output(output_path)
if attributes[:rpm_auto_add_directories?]
fs_dirs_list = File.join(template_dir, "rpm", "filesystem_list")
fs_dirs = File.readlines(fs_dirs_list).reject { |x| x =~ /^\s*#/}.map { |x| x.chomp }
fs_dirs.concat((attributes[:auto_add_exclude_directories] or []))

Find.find(staging_path) do |path|
next if path == staging_path
Expand Down