diff options
author | Evan Kaufman <evan@digitalflophouse.com> | 2016-08-04 14:00:04 -0700 |
---|---|---|
committer | Toshio Kuratomi <a.badger@gmail.com> | 2016-11-01 07:58:59 -0700 |
commit | 29403162dd854a8bbea0e2003ee75417dd9bdbe4 (patch) | |
tree | ccaf611f1896ff763c5a37a2d2169cb48ae3355f | |
parent | 061f8a8a9a92eb69c067bafcf91db80dfe2cce9f (diff) | |
download | ansible-modules-core-29403162dd854a8bbea0e2003ee75417dd9bdbe4.tar.gz |
Rendering of crontab should reflect actual newline termination, in diff mode
(cherry picked from commit 7c9401a7ff4e3c1d1078be06293afca089d7fc05)
-rw-r--r-- | system/cron.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/system/cron.py b/system/cron.py index f13032c8..634d1d6b 100644 --- a/system/cron.py +++ b/system/cron.py @@ -460,7 +460,7 @@ class CronTab(object): self.lines = newlines - def render(self): + def render(self, diff=None): """ Render this crontab as it would be in the crontab. """ @@ -469,7 +469,7 @@ class CronTab(object): crons.append(cron) result = '\n'.join(crons) - if result: + if result and not diff: result = result.rstrip('\r\n') + '\n' return result @@ -586,7 +586,7 @@ def main(): if module._diff: diff = dict() - diff['before'] = crontab.render() + diff['before'] = crontab.render(diff=True) if crontab.cron_file: diff['before_header'] = crontab.cron_file else: |