]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
gp: Ignore crontab -l error, since it means empty
authorDavid Mulder <dmulder@samba.org>
Tue, 8 Nov 2022 18:03:36 +0000 (11:03 -0700)
committerJeremy Allison <jra@samba.org>
Tue, 8 Nov 2022 22:33:37 +0000 (22:33 +0000)
We should not fail when crontab -l errors, this
just means the crontab is empty.

Signed-off-by: David Mulder <dmulder@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Nov  8 22:33:37 UTC 2022 on sn-devel-184

python/samba/gp/gp_scripts_ext.py

index 3ff650996bb1ea75d3cdb7965504ead1c5575699..bbf609cf5d5f751374d9415234841bade92da892 100644 (file)
@@ -20,6 +20,7 @@ from samba.gp.gpclass import gp_pol_ext, drop_privileges
 from base64 import b64encode
 from hashlib import blake2b
 from tempfile import NamedTemporaryFile
+from samba.gp.util.logging import log
 
 intro = '''
 ### autogenerated by samba
@@ -98,7 +99,7 @@ def fetch_crontab(username):
     p = Popen(['crontab', '-l', '-u', username], stdout=PIPE, stderr=PIPE)
     out, err = p.communicate()
     if p.returncode != 0:
-        raise RuntimeError('Failed to read the crontab: %s' % err)
+        log.warning('Failed to read the crontab: %s' % err)
     m = re.findall('%s(.*)%s' % (intro, end), out.decode(), re.DOTALL)
     if len(m) == 1:
         entries = m[0].strip().split('\n')