Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/302670
Change subject: Convert back to tabs, rename .prefs file
......................................................................
Convert back to tabs, rename .prefs file
The bash <<- operator only works with tabs, not spaces, which caused
the apt preferences file to be indented and fail to work.
Change-Id: I63fae273ac8e12d41e642c7a639e883e03c2aad3
---
M modules/package_builder/templates/D02backports.erb
1 file changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/70/302670/1
diff --git a/modules/package_builder/templates/D02backports.erb
b/modules/package_builder/templates/D02backports.erb
index 3052229..eb2451d 100755
--- a/modules/package_builder/templates/D02backports.erb
+++ b/modules/package_builder/templates/D02backports.erb
@@ -2,14 +2,14 @@
# Avoid running hooks if backports is not specified
if [ "${BACKPORTS}" = "yes" ]; then
- cat > /etc/apt/sources.list.d/<%= @distribution %>-backports.list <<-'EOF'
- deb <%= @upstream_mirror %> <%= @distribution %>-backports main contrib
non-free
- deb-src <%= @upstream_mirror %> <%= @distribution %>-backports main
contrib non-free
+ cat > /etc/apt/sources.list.d/<%= @distribution %>-backports.list
<<-'EOF'
+ deb <%= @upstream_mirror %> <%= @distribution %>-backports main contrib
non-free
+ deb-src <%= @upstream_mirror %> <%= @distribution %>-backports main
contrib non-free
EOF
- cat > /etc/apt/preferences.d/<%= @distribution %>.pref <<-'EOF'
- Package: *
- Pin: release a=<%= @distribution %>-backports
- Pin-Priority: 500
+ cat > /etc/apt/preferences.d/<%= @distribution %>-backports.pref
<<-'EOF'
+ Package: *
+ Pin: release a=<%= @distribution %>-backports
+ Pin-Priority: 500
EOF
- apt-get update
+ apt-get update
fi
--
To view, visit https://gerrit.wikimedia.org/r/302670
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I63fae273ac8e12d41e642c7a639e883e03c2aad3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <m...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
