From 2c2105fadbf300845dfced4e75b232cfd3795d04 Mon Sep 17 00:00:00 2001 From: Attila Fazekas Date: Sun, 6 Jul 2014 09:44:41 +0200 Subject: [PATCH] Do not fail the install_puppet.sh on 2th run The pip-python symbolic link creation is the last step in the install_puppet.sh on Fedora. If the symbolic link already exists, the exit status of the script will be failed. After this change the pip-python link will be created by force, so it will not fail on second run, and it may correct an old incorrect link. Change-Id: I0b25b1d69ee5e851f15e44fd16f62c29676d2075 --- install_puppet.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install_puppet.sh b/install_puppet.sh index 4d07e22767..507e88aec1 100755 --- a/install_puppet.sh +++ b/install_puppet.sh @@ -74,13 +74,13 @@ function setup_puppet_fedora { ln -s /usr/local/share/gems/gems/hiera-puppet-* /etc/puppet/modules/ fi - # Puppet expects for an expects the command to be pip-python on + # Puppet expects the pip command named as pip-python on # Fedora, as per the packaged command name. However, we're # installing from get-pip.py so it's just 'pip'. An easy # work-around is to just symlink pip-python to "fool" it. # See upstream issue: # https://tickets.puppetlabs.com/browse/PUP-1082 - ln -s /usr/bin/pip /usr/bin/pip-python + ln -fs /usr/bin/pip /usr/bin/pip-python } function setup_puppet_rhel7 {