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

Restore setting cachedir when non-root but don't take a useless cachedir parameter to the function

Browse source 
* Revert "Remove unused code"
  This reverts commit bcfba0c050.
* Re-add the changes to remove cachedir as a parameter
This commit is contained in:
Toshio Kuratomi 2015-06-16 06:57:32 -07:00 committed by Matt Clay
parent 4cdd58064d
commit ada424078b
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/modules/packaging/os/yum.py
View file

@ -171,6 +171,14 @@ def yum_base(conf_file=None):
my.preconf.errorlevel=0 my.preconf.errorlevel=0
if conf_file and os.path.exists(conf_file): if conf_file and os.path.exists(conf_file):
my.preconf.fn = conf_file my.preconf.fn = conf_file
if os.geteuid() != 0:
if hasattr(my, 'setCacheDir'):
my.setCacheDir()
else:
cachedir = yum.misc.getCacheDir()
my.repos.setCacheDir(cachedir)
my.conf.cache = 0
return my return my
def install_yum_utils(module): def install_yum_utils(module):