Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge pull request #666 from HelenCampbell/release
[puppet-modules/puppetlabs-apt.git]
/
templates
/
pin.pref.erb
diff --git
a/templates/pin.pref.erb
b/templates/pin.pref.erb
index 62c44c72414b41551ad8334c468ec70ba8ccc80f..76936d7ca47f0de45273dcdd6b4cd6317455069d 100644
(file)
--- a/
templates/pin.pref.erb
+++ b/
templates/pin.pref.erb
@@
-12,11
+12,10
@@
if @pin_release.length > 0
elsif @version.length > 0
@pin = "version #{@version}"
elsif @origin.length > 0
elsif @version.length > 0
@pin = "version #{@version}"
elsif @origin.length > 0
- @pin = "origin
\"#{@origin}\"
"
+ @pin = "origin
#{@origin}
"
end
-%>
end
-%>
-# <%= @name %>
-Explanation: <%= @explanation %>
-Package: <%= @packages %>
+Explanation: <%= @_explanation %>
+Package: <%= @packages_string %>
Pin: <%= @pin %>
Pin-Priority: <%= @priority %>
Pin: <%= @pin %>
Pin-Priority: <%= @priority %>