1
0
mirror of https://github.com/openSUSE/osc.git synced 2024-11-09 22:36:14 +01:00

Improve logic for conffile mode handling

This commit is contained in:
William Brown 2021-10-21 10:44:20 +10:00
parent 16ec3ff9f9
commit d56a46b669

View File

@ -38,6 +38,7 @@ The configuration dictionary could look like this:
import bz2
import base64
import errno
import os
import re
import sys
@ -896,7 +897,15 @@ def get_config(override_conffile=None,
# okay, we made sure that oscrc exists
# make sure it is not world readable, it may contain a password.
os.chmod(conffile, 0o600)
conffile_stat = os.stat(conffile)
if conffile_stat.st_mode != 0o600:
try:
os.chmod(conffile, 0o600)
except OSError as e:
if e.errno == errno.EROFS:
print('Warning: file \'%s\' may have an insecure mode.', conffile)
else:
raise e
cp = get_configParser(conffile)