a devrait aller maintenant
darcs-hash:20021027015340-a279a-6a7744641c04309ac0daffa71920010288c85b48.gz
This commit is contained in:
parent
59b4d42206
commit
9215b82eb0
1 changed files with 4 additions and 2 deletions
6
syncmail
6
syncmail
|
@ -221,6 +221,8 @@ def blast_mail(subject, people, filestodiff, contextlines, fromhost):
|
||||||
conn.connect(MAILHOST, MAILPORT)
|
conn.connect(MAILHOST, MAILPORT)
|
||||||
user = pwd.getpwuid(os.getuid())[0]
|
user = pwd.getpwuid(os.getuid())[0]
|
||||||
domain = fromhost or getfqdn()
|
domain = fromhost or getfqdn()
|
||||||
|
#Modif cosmétique pour afficher un sujet explicite :
|
||||||
|
host = string.split(domain,'.')
|
||||||
author = '%s@%s' % (user, domain)
|
author = '%s@%s' % (user, domain)
|
||||||
s = StringIO()
|
s = StringIO()
|
||||||
sys.stdout = s
|
sys.stdout = s
|
||||||
|
@ -229,10 +231,10 @@ def blast_mail(subject, people, filestodiff, contextlines, fromhost):
|
||||||
From: %(author)s
|
From: %(author)s
|
||||||
To: %(people)s
|
To: %(people)s
|
||||||
Subject: %(subject)s
|
Subject: %(subject)s
|
||||||
X-CVSinfo: CVS@crans
|
X-CVSinfo: CRANS
|
||||||
''' % {'author' : author,
|
''' % {'author' : author,
|
||||||
'people' : string.join(people, COMMASPACE),
|
'people' : string.join(people, COMMASPACE),
|
||||||
'subject': 'CVS commit sur'+domain+' : '+ subject,
|
'subject': 'CVS commit sur '+host+' : '+ subject,
|
||||||
}
|
}
|
||||||
s.write(sys.stdin.read())
|
s.write(sys.stdin.read())
|
||||||
# append the diffs if available
|
# append the diffs if available
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue