Skip to content

Commit c3e270a

Browse files
committed
test
1 parent 69d87d6 commit c3e270a

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

resources/puppetlabs/lein-ezbake/template/global/controller.sh.erb

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,14 @@ fi
152152
params+=('--logrotate')
153153
<% end -%>
154154

155-
<% EZBake::Config[:replaces_pkgs].each do |package, version| -%>
155+
# In this part, we should really be fixing the use of as-ruby-literal
156+
# rather than messing with quotes here. But someone more familiar with
157+
# Clojure than I can do that.
158+
#<% EZBake::Config[:replaces_pkgs].each do |package, version| -%>
159+
#<% munged_package = package.delete_prefix("'").delete_suffix("'") %>
160+
#<% munged_version = version.nil? ? '' : version.delete_prefix("'").delete_suffix("'") %>
161+
#<% replaces_str = munged_version.empty? ? "#{munged_package}" : "#{munged_package} #{munged_version}" %>
162+
#params+=('--replaces' "<%= replaces_str -%>")
156163
params+=('--replaces' "<%= package -%>,<%= version -%>")
157164
<% end %>
158165

resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,6 @@
350350
shared_opts << "--url http://github.com/openvoxproject"
351351
shared_opts << "--architecture all"
352352

353-
puts "######## Replaces: #{options.replaces}"
354353
options.replaces.each do |pkg, version|
355354
if options.output_type == 'rpm'
356355
val = if version.nil? || version.empty?

0 commit comments

Comments
 (0)