Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-11-04 07:54:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Further magic reduction in ubu_email

Browse Source
This commit is contained in:
Stefano Rivera 2010-12-21 00:18:47 +02:00
parent 0a272cab3f
commit 7229c63dc2
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ubuntutools/config.py
View File

@ -118,28 +118,24 @@ def ubu_email(name=None, email=None, export=True):
if export and not name and not email and 'UBUMAIL' not in os.environ:
export = False
for var, target in (
('UBUMAIL', 'name'),
('UBUMAIL', 'email'),
for var, target in (('UBUMAIL', 'email'),
('DEBFULLNAME', 'name'),
('DEBEMAIL', 'name'),
('DEBEMAIL', 'email'),
('NAME', 'name'),
):
if name and email:
break
if var in os.environ and not locals()[target]:
if var.endswith('MAIL'):
if var in os.environ:
m = name_email_re.match(os.environ[var])
if m:
if target == 'name':
if not name:
name = m.group(1)
elif target == 'email':
if not email:
email = m.group(2)
elif target == 'email':
email = os.environ[var].strip()
elif var.endswith('NAME') and target == 'name':
elif target == 'name' and not name:
name = os.environ[var].strip()
elif target == 'email' and not email:
email = os.environ[var].strip()
if not name:
gecos_name = pwd.getpwuid(os.getuid())[4].split(',')[0].strip()