mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2026-03-08 01:56:15 +01:00
Code Activity

Merge pull request #2063 from openSUSE/fix/oscrc-lookup

Browse Source 
Fix oscrc lookup: prefer XDG location, warn if there are multiple configs
This commit is contained in:
Daniel Mach
2026-03-06 14:28:03 +01:00
committed by GitHub
parent 78815d2ef7 e2bd20cd8a
commit acf0d46b0f
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
osc/conf.py
View File

@@ -2137,18 +2137,20 @@ def identify_conf():
if 'OSC_CONFIG' in os.environ:
return os.environ.get('OSC_CONFIG')
conffile = os.path.join(xdg.XDG_CONFIG_HOME, "osc", "oscrc")
conffile_home = "~/.oscrc"
conffile_home_expanded = os.path.expanduser(conffile_home)
conffile_xdg = os.path.join(xdg.XDG_CONFIG_HOME, "osc", "oscrc")
conffile_xdg_expanded = os.path.expanduser(conffile_xdg)
if os.path.exists(os.path.expanduser("~/.oscrc")) or os.path.islink(os.path.expanduser("~/.oscrc")):
if "XDG_CONFIG_HOME" in os.environ:
print(f"{tty.colorize('WARNING', 'yellow,bold')}: Ignoring XDG_CONFIG_HOME env, loading an existing config from '~/.oscrc' instead", file=sys.stderr)
print(" To fix this, move the existing '~/.oscrc' to XDG location such as '~/.config/osc/oscrc'", file=sys.stderr)
elif os.path.exists(os.path.expanduser(conffile)):
print(f"{tty.colorize('WARNING', 'yellow,bold')}: Ignoring config '{conffile}' in XDG location, loading an existing config from ~/.oscrc instead", file=sys.stderr)
print(" To fix this, remove '~/.oscrc'", file=sys.stderr)
return '~/.oscrc'
return conffile
# prefer config in XDG location, warn if there are configs in multiple locations
if os.path.exists(conffile_xdg_expanded):
# we need to use islink() because ~/.oscrc can be a dangling symlink and isfile() would return False in such case
if os.path.exists(conffile_home_expanded) or os.path.islink(conffile_home_expanded):
print(f"{tty.colorize('WARNING', 'yellow,bold')}: Multiple config files detected. Ignoring '{conffile_home}', using '{conffile_xdg}'", file=sys.stderr)
return conffile_xdg
if os.path.exists(conffile_home_expanded):
return conffile_home
return conffile_xdg
def interactive_config_setup(conffile, apiurl, initial=True):