Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: hiera/install_precise.py

Issue 29337797: Issue 3706 - Update Puppet patch version (Closed)
Patch Set: Created Feb. 26, 2016, 7:32 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: hiera/install_precise.py
diff --git a/hiera/install_precise.py b/hiera/install_precise.py
index b80c467587d29d4cc670c7755a984543f5d813de..e149357174a5e5cbc3c737bc454b9e75f89ec21c 100755
--- a/hiera/install_precise.py
+++ b/hiera/install_precise.py
@@ -18,8 +18,8 @@ PUPPETLABS_PREFS = '''
# Puppetlabs packages (e.g. hiera) would attempt to install a puppet 3.x
# or later release (which is not available in precise) if not pinned here
Package: puppet puppet-common
-Pin: version 2.7.11-*
-Pin-Priority: 1000'''
+Pin: version 2.7.26-*
+Pin-Priority: 501'''
PUPPETLABS_GPG_KEY = '''
-----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -94,8 +94,9 @@ with io.open('/etc/apt/preferences.d/puppetlabs', 'wb') as handle:
handle.write(PUPPETLABS_PREFS)
subprocess.check_call(['apt-get', '-y', 'update'])
-subprocess.check_call(['apt-get', '-y', 'install', 'puppet'])
-subprocess.check_call(['apt-get', '-y', 'install', 'hiera-puppet'])
+subprocess.check_call(['apt-get', '-y', 'install',
+ '-o', 'Dpkg::Options::=--force-overwrite',
+ 'puppet', 'puppet-common', 'hiera-puppet'])
if not os.path.exists('/etc/puppet/hiera.yaml'):
realpath = os.path.realpath(__file__)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld