cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Retain local tar.gz roles during galaxy install (#16592)

Browse source 
Don't treat local tar.gz files as temporary when cleaning
up at the end of an ansible-galaxy install
This commit is contained in:
Will Thames 2016-07-07 02:28:54 +10:00 committed by Brian Coca
parent 1c2bc49025
commit 0e16a5f3ee
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/ansible/galaxy/role.py
View file

@ -188,6 +188,7 @@ class GalaxyRole(object):
def install(self):
# the file is a tar, so open it that way and extract it
# to the specified (or default) roles directory
local_file = False
if self.scm:
# create tar file from scm url
@ -195,6 +196,7 @@ class GalaxyRole(object):
elif self.src:
if os.path.isfile(self.src):
# installing a local tar.gz
local_file = True
tmp_file = self.src
elif '://' in self.src:
role_data = self.src
@ -294,10 +296,11 @@ class GalaxyRole(object):
# return the parsed yaml metadata
display.display("- %s was installed successfully" % self.name)
try:
os.unlink(tmp_file)
except (OSError,IOError) as e:
display.warning("Unable to remove tmp file (%s): %s" % (tmp_file, str(e)))
if not local_file:
try:
os.unlink(tmp_file)
except (OSError,IOError) as e:
display.warning("Unable to remove tmp file (%s): %s" % (tmp_file, str(e)))
return True
return False