mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-25 22:36:13 +01:00
Code

Merge pull request #1549 from dmach/conf-fix-override-check

Browse Source 
Several fixes in osc.conf
This commit is contained in:
Daniel Mach 2024-04-26 11:30:57 +02:00 committed by GitHub
commit f908092f3d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osc/conf.py
View File

@ -1869,7 +1869,8 @@ def get_config(override_conffile=None,
# make sure oscrc is not world readable, it may contain a password # make sure oscrc is not world readable, it may contain a password
conffile_stat = os.stat(conffile) conffile_stat = os.stat(conffile)
if conffile_stat.st_mode != 0o600: # applying 0o7777 mask because we want to ignore the file type bits
if conffile_stat.st_mode & 0o7777 != 0o600:
try: try:
os.chmod(conffile, 0o600) os.chmod(conffile, 0o600)
except OSError as e: except OSError as e:
@ -1974,6 +1975,9 @@ def get_config(override_conffile=None,
# priority: env, overrides, config # priority: env, overrides, config
if env_key in os.environ: if env_key in os.environ:
value = os.environ[env_key] value = os.environ[env_key]
# remove any matching records from overrides because they are checked for emptiness later
overrides.pop(name, None)
overrides.pop(ini_key, None)
elif name in overrides: elif name in overrides:
value = overrides.pop(name) value = overrides.pop(name)
elif ini_key in overrides: elif ini_key in overrides: