mirrors/git-repo
1
0
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2026-01-12 01:20:26 +00:00
Code Issues Projects Releases Wiki Activity

Fix error parsing a non-existant configuration file

Browse Source 
If a file (e.g. ~/.gitconfig) does not exist, we get None
here rather than a string.  NoneType lacks rstrip() so we
cannot strip it.

Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce
2009-07-02 16:12:57 -07:00
parent 2d1a396897
commit c24c720b61
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
git_config.py
View File

@@ -265,9 +265,11 @@ class GitConfig(object):
This internal method populates the GitConfig cache.
"""
d = self._do('--null', '--list').rstrip('\0')
c = {}
for line in d.split('\0'):
d = self._do('--null', '--list')
if d is None:
return c
for line in d.rstrip('\0').split('\0'):
if '\n' in line:
key, val = line.split('\n', 1)
else: