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

cron - Only run get_bin_path() once (#62554)

Browse source
This commit is contained in:
Sam Doran 2019-09-18 19:04:26 -04:00 committed by ansibot
parent 064e443ea5
commit b7897e3a8d
3 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/cron-only-get-bin-path-once.yaml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- cron cronvar - only run ``get_bin_path()`` once

16
lib/ansible/modules/system/cron.py
View file

@ -235,6 +235,7 @@ class CronTab(object):
self.lines = None self.lines = None
self.ansible = "#Ansible: " self.ansible = "#Ansible: "
self.existing = '' self.existing = ''
self.cron_cmd = self.module.get_bin_path('crontab', required=True)
if cron_file: if cron_file:
if os.path.isabs(cron_file): if os.path.isabs(cron_file):
@ -509,30 +510,29 @@ class CronTab(object):
Returns the command line for reading a crontab Returns the command line for reading a crontab
""" """
user = '' user = ''
cron_cmd = self.module.get_bin_path('crontab', required=True)
if self.user: if self.user:
if platform.system() == 'SunOS': if platform.system() == 'SunOS':
return "su %s -c '%s -l'" % (shlex_quote(self.user), shlex_quote(cron_cmd)) return "su %s -c '%s -l'" % (shlex_quote(self.user), shlex_quote(self.cron_cmd))
elif platform.system() == 'AIX': elif platform.system() == 'AIX':
return "%s -l %s" % (shlex_quote(cron_cmd), shlex_quote(self.user)) return "%s -l %s" % (shlex_quote(self.cron_cmd), shlex_quote(self.user))
elif platform.system() == 'HP-UX': elif platform.system() == 'HP-UX':
return "%s %s %s" % (cron_cmd, '-l', shlex_quote(self.user)) return "%s %s %s" % (self.cron_cmd, '-l', shlex_quote(self.user))
elif pwd.getpwuid(os.getuid())[0] != self.user: elif pwd.getpwuid(os.getuid())[0] != self.user:
user = '-u %s' % shlex_quote(self.user) user = '-u %s' % shlex_quote(self.user)
return "%s %s %s" % (cron_cmd, user, '-l') return "%s %s %s" % (self.cron_cmd, user, '-l')
def _write_execute(self, path): def _write_execute(self, path):
""" """
Return the command line for writing a crontab Return the command line for writing a crontab
""" """
cron_cmd = self.module.get_bin_path('crontab', required=True)
user = '' user = ''
if self.user: if self.user:
if platform.system() in ['SunOS', 'HP-UX', 'AIX']: if platform.system() in ['SunOS', 'HP-UX', 'AIX']:
return "chown %s %s ; su '%s' -c '%s %s'" % (shlex_quote(self.user), shlex_quote(path), shlex_quote(self.user), cron_cmd, shlex_quote(path)) return "chown %s %s ; su '%s' -c '%s %s'" % (
shlex_quote(self.user), shlex_quote(path), shlex_quote(self.user), self.cron_cmd, shlex_quote(path))
elif pwd.getpwuid(os.getuid())[0] != self.user: elif pwd.getpwuid(os.getuid())[0] != self.user:
user = '-u %s' % shlex_quote(self.user) user = '-u %s' % shlex_quote(self.user)
return "%s %s %s" % (cron_cmd, user, shlex_quote(path)) return "%s %s %s" % (self.cron_cmd, user, shlex_quote(path))
def main(): def main():

16
lib/ansible/modules/system/cronvar.py
View file

@ -126,6 +126,7 @@ class CronVar(object):
self.user = user self.user = user
self.lines = None self.lines = None
self.wordchars = ''.join(chr(x) for x in range(128) if chr(x) not in ('=', "'", '"',)) self.wordchars = ''.join(chr(x) for x in range(128) if chr(x) not in ('=', "'", '"',))
self.cron_cmd = self.module.get_bin_path('cronvar', required=True)
if cron_file: if cron_file:
self.cron_file = "" self.cron_file = ""
@ -290,32 +291,31 @@ class CronVar(object):
""" """
Returns the command line for reading a crontab Returns the command line for reading a crontab
""" """
cron_cmd = self.module.get_bin_path('crontab', required=True)
user = '' user = ''
if self.user: if self.user:
if platform.system() == 'SunOS': if platform.system() == 'SunOS':
return "su %s -c '%s -l'" % (shlex_quote(self.user), shlex_quote(cron_cmd)) return "su %s -c '%s -l'" % (shlex_quote(self.user), shlex_quote(self.cron_cmd))
elif platform.system() == 'AIX': elif platform.system() == 'AIX':
return "%s -l %s" % (shlex_quote(cron_cmd), shlex_quote(self.user)) return "%s -l %s" % (shlex_quote(self.cron_cmd), shlex_quote(self.user))
elif platform.system() == 'HP-UX': elif platform.system() == 'HP-UX':
return "%s %s %s" % (cron_cmd, '-l', shlex_quote(self.user)) return "%s %s %s" % (self.cron_cmd, '-l', shlex_quote(self.user))
elif pwd.getpwuid(os.getuid())[0] != self.user: elif pwd.getpwuid(os.getuid())[0] != self.user:
user = '-u %s' % shlex_quote(self.user) user = '-u %s' % shlex_quote(self.user)
return "%s %s %s" % (cron_cmd, user, '-l') return "%s %s %s" % (self.cron_cmd, user, '-l')
def _write_execute(self, path): def _write_execute(self, path):
""" """
Return the command line for writing a crontab Return the command line for writing a crontab
""" """
cron_cmd = self.module.get_bin_path('crontab', required=True)
user = '' user = ''
if self.user: if self.user:
if platform.system() in ['SunOS', 'HP-UX', 'AIX']: if platform.system() in ['SunOS', 'HP-UX', 'AIX']:
return "chown %s %s ; su '%s' -c '%s %s'" % (shlex_quote(self.user), shlex_quote(path), shlex_quote(self.user), cron_cmd, shlex_quote(path)) return "chown %s %s ; su '%s' -c '%s %s'" % (
shlex_quote(self.user), shlex_quote(path), shlex_quote(self.user), self.cron_cmd, shlex_quote(path))
elif pwd.getpwuid(os.getuid())[0] != self.user: elif pwd.getpwuid(os.getuid())[0] != self.user:
user = '-u %s' % shlex_quote(self.user) user = '-u %s' % shlex_quote(self.user)
return "%s %s %s" % (cron_cmd, user, shlex_quote(path)) return "%s %s %s" % (self.cron_cmd, user, shlex_quote(path))
# ================================================== # ==================================================