From 5badb4233cb59a6045e544576ebabff94c02131e Mon Sep 17 00:00:00 2001 From: Florence Blanc-Renaud Date: Wed, 16 Oct 2019 17:02:38 +0200 Subject: [PATCH] ipa-backup: fix python2 issue with os.mkdir Python2 and python3 have different interfaces for os.mkdir: python2: os.mkdir(path[, mode]) python3: os.mkdir(path, mode=0o777, *, dir_fd=None) ipa-backup is using the python3 format, which breaks deployments using python2. The fix consists in using os.mkdir(path, 0o700) instead of os.mkdir(path, mode=0o700). Fixes: https://pagure.io/freeipa/issue/8099 Reviewed-By: Alexander Bokovoy --- ipaserver/install/ipa_backup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ipaserver/install/ipa_backup.py b/ipaserver/install/ipa_backup.py index 96f3d7e1c6abdc6a4f3080810a8ea3bd8211d16b..496bbd8925972a6e1dbdd00c01b62f2e2c4398d6 100644 --- a/ipaserver/install/ipa_backup.py +++ b/ipaserver/install/ipa_backup.py @@ -289,7 +289,7 @@ class Backup(admintool.AdminTool): os.chown(self.top_dir, pent.pw_uid, pent.pw_gid) os.chmod(self.top_dir, 0o750) self.dir = os.path.join(self.top_dir, "ipa") - os.mkdir(self.dir, mode=0o750) + os.mkdir(self.dir, 0o750) os.chown(self.dir, pent.pw_uid, pent.pw_gid) self.tarfile = None @@ -663,7 +663,7 @@ class Backup(admintool.AdminTool): filename = os.path.join(backup_dir, "ipa-full.tar") try: - os.mkdir(backup_dir, mode=0o700) + os.mkdir(backup_dir, 0o700) except (OSError, IOError) as e: raise admintool.ScriptError( 'Could not create backup directory: %s' % e -- 2.20.1