From 74e70d5613813fb731614dbdb4c9f722263a9cd0 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 9 Jan 2022 08:44:06 +0100 Subject: Merging upstream version 0.16.1. Signed-off-by: Daniel Baumann --- gita/common.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'gita/common.py') diff --git a/gita/common.py b/gita/common.py index abbef5f..e1a3dde 100644 --- a/gita/common.py +++ b/gita/common.py @@ -1,17 +1,14 @@ import os -def get_config_dir(root=None) -> str: - if root is None: - root = os.environ.get('XDG_CONFIG_HOME') or os.path.join( - os.path.expanduser('~'), '.config') - return os.path.join(root, "gita") - else: - return os.path.join(root, ".gita") +def get_config_dir() -> str: + root = os.environ.get('XDG_CONFIG_HOME') or os.path.join( + os.path.expanduser('~'), '.config') + return os.path.join(root, "gita") -def get_config_fname(fname: str, root=None) -> str: +def get_config_fname(fname: str) -> str: """ Return the file name that stores the repo locations. """ - return os.path.join(get_config_dir(root), fname) + return os.path.join(get_config_dir(), fname) -- cgit v1.2.3