fix config loading if XDG_CONFIG_HOME defined

arthurzam · arthurzam · commit 9f60576753da · 2022-06-10T16:36:57.000+03:00
Fixes: #72 Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
diff --git a/doc/man/config.rst b/doc/man/config.rst
@@ -5,9 +5,10 @@ Config files are supported by most subcommands of ``pkgdev`` from any of three
 locations. Listed in order of increasing precedence these include the
 following:
 
-- system config -- /etc/pkgdev/pkgdev.conf
-- user config -- ~/.config/pkgdev/pkgdev.conf
-- custom config -- specified via the --config option
+- system config -- ``/etc/pkgdev/pkgdev.conf``
+- user config -- ``${XDG_CONFIG_HOME}/pkgdev/pkgdev.conf``
+- user config -- ``~/.config/pkgdev/pkgdev.conf``
+- custom config -- specified via the ``--config`` option
 
 Any settings from a config file with higher precedence will override matching
 settings from a config file with a lower precedence, e.g. user settings
@@ -33,7 +34,8 @@ related values. To find all possible configuration options, run:
     [gentoo]
     push.ask = true
 
-- Add `Signed-off-by` consenting to the `Certificate of Origin <https://www.gentoo.org/glep/glep-0076.html#certificate-of-origin>`_
+- Add `Signed-off-by` consenting to the `Certificate of Origin
+  <https://www.gentoo.org/glep/glep-0076.html#certificate-of-origin>`_
   to all commits::
 
     [DEFAULT]
diff --git a/src/pkgdev/const.py b/src/pkgdev/const.py
@@ -26,16 +26,14 @@ def _GET_CONST(attr, default_value):
 # determine XDG compatible paths
 for xdg_var, var_name, fallback_dir in (
         ('XDG_CONFIG_HOME', 'USER_CONFIG_PATH', '~/.config'),
-        ('XDG_CACHE_HOME', 'USER_CACHE_PATH', '~/.cache'),
         ('XDG_DATA_HOME', 'USER_DATA_PATH', '~/.local/share')):
     setattr(
         _module, var_name,
-        os.environ.get(xdg_var, os.path.join(os.path.expanduser(fallback_dir), 'pkgdev')))
+        os.path.join(os.environ.get(xdg_var, os.path.expanduser(fallback_dir)), 'pkgdev'))
 
 REPO_PATH = _GET_CONST('REPO_PATH', _reporoot)
 DATA_PATH = _GET_CONST('DATA_PATH', '%(REPO_PATH)s/data')
 
-USER_CACHE_DIR = getattr(_module, 'USER_CACHE_PATH')
 USER_CONF_FILE = os.path.join(getattr(_module, 'USER_CONFIG_PATH'), 'pkgdev.conf')
 SYSTEM_CONF_FILE = '/etc/pkgdev/pkgdev.conf'
 BUNDLED_CONF_FILE = os.path.join(DATA_PATH, 'pkgdev.conf')
