Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb
Original file line number Diff line number Diff line change
Expand Up @@ -468,8 +468,8 @@ def patch_files(options)

patch_files(options) do
# fpm sends all output to stdout
out, _, stat = Open3.capture3("#{fpm_editor} fpm #{fpm_opts.join(' ')}")
fail "Error trying to run FPM for #{options.dist}!\n#{out}" unless stat.success?
out, err, stat = Open3.capture3("#{fpm_editor} fpm #{fpm_opts.join(' ')}")
fail "Error trying to run FPM for #{options.dist}!\n stderr: #{err}\n stdout: #{out}\n" unless stat.success?

puts "#{out}"

Expand All @@ -482,8 +482,8 @@ def patch_files(options)
end

# fpm sends all output to stdout
out, _, stat = Open3.capture3("fpm #{termini_opts.join(' ')}")
fail "Error trying to run FPM for the termini for #{options.dist}!\n#{out}" unless stat.success?
out, err, stat = Open3.capture3("fpm #{termini_opts.join(' ')}")
fail "Error trying to run FPM for the termini for #{options.dist}!\n stderr: #{err}\n stdout: #{out}\n" unless stat.success?
puts "#{out}"
end
end
2 changes: 1 addition & 1 deletion src/puppetlabs/ezbake/core.clj
Original file line number Diff line number Diff line change
Expand Up @@ -994,7 +994,7 @@ Additional uberjar dependencies:
(defmethod action "local-build"
[_ lein-project build-target]
(action "stage" lein-project build-target)
(exec/exec "bundle" "install" "--path" ".bundle/gems" "--binstubs" ".bundle/bin" :dir staging-dir)
;; (exec/exec "bundle" "install" "--path" ".bundle/gems" "--binstubs" ".bundle/bin" :dir staging-dir)
(let [downstream-job nil
rake-call ["bundle" "exec" "rake" "pl:local_build"]]
(exec/lazy-sh rake-call {:dir staging-dir})))
Expand Down