Add ability to specify replace-pkgs with an empty version

Author: nmburgan

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

@@ -152,7 +152,14 @@ fi
 params+=('--logrotate')
 <% end -%>
 
-<% EZBake::Config[:replaces_pkgs].each do |package, version| -%>
+# In this part, we should really be fixing the use of as-ruby-literal
+# rather than messing with quotes here. But someone more familiar with
+# Clojure than I can do that.
+#<% EZBake::Config[:replaces_pkgs].each do |package, version| -%>
+#<% munged_package = package.delete_prefix("'").delete_suffix("'") %>
+#<% munged_version = version.nil? ? '' : version.delete_prefix("'").delete_suffix("'") %>
+#<% replaces_str = munged_version.empty? ? "#{munged_package}" : "#{munged_package} #{munged_version}" %>
+#params+=('--replaces' "<%= replaces_str -%>")
 params+=('--replaces' "<%= package -%>,<%= version -%>")
 <% end %>
 

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

@@ -351,15 +351,32 @@
 shared_opts << "--architecture all"
 
 options.replaces.each do |pkg, version|
+  # Strip the surrounding quotes since we add them in a certain way here.
+  # We should probably just fix this in the core code by being smarter with
+  # as-ruby-literaly, but someone more familiar with Clojure can do that part.
+  pkg = pkg.delete_prefix("'").delete_suffix("'")
+  version = version.delete_prefix("'").delete_suffix("'") unless version.nil?
   if options.output_type == 'rpm'
-    fpm_opts << "--replaces '#{pkg} <= #{version}-1'"
-    fpm_opts << "--conflicts '#{pkg} <= #{version}-1'"
+    val = if version.nil? || version.empty?
+            "'#{pkg}'"
+          else
+            "'#{pkg} <= #{version}-1'"
+          end
+    fpm_opts << "--replaces #{val}"
+    fpm_opts << "--conflicts #{val}"
   elsif options.output_type == 'deb'
     # why debian, why.
-    fpm_opts << "--replaces '#{pkg} (<< #{version}-1openvox1)'"
-    fpm_opts << "--conflicts '#{pkg} (<< #{version}-1openvox1)'"
-    fpm_opts << "--replaces '#{pkg} (<< #{version}-1#{options.dist})'"
-    fpm_opts << "--conflicts '#{pkg} (<< #{version}-1#{options.dist})'"
+    if version.nil? || version.empty?
+      fpm_opts << "--replaces '#{pkg}'"
+      fpm_opts << "--conflicts '#{pkg}'"
+    else
+      fpm_opts << "--replaces '#{pkg} (<< #{version}-1voxpupuli1)'"
+      fpm_opts << "--conflicts '#{pkg} (<< #{version}-1voxpupuli1)'"
+      fpm_opts << "--replaces '#{pkg} (<< #{version}-1puppetlabs1)'"
+      fpm_opts << "--conflicts '#{pkg} (<< #{version}-1puppetlabs1)'"
+      fpm_opts << "--replaces '#{pkg} (<< #{version}-1#{options.dist})'"
+      fpm_opts << "--conflicts '#{pkg} (<< #{version}-1#{options.dist})'"
+    end
   end
 end