crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Centralisation du remplacement de os.getlogin

Browse source 
On utilise la variable SUDO_USER et sinon on se rabat sur un getuid

darcs-hash:20040910192447-41617-51511e6987093eae4473592bde71fa0bd73f0151.gz
This commit is contained in:
pauget 2004-09-10 21:24:47 +02:00
parent 3d34d11860
commit e0da11ea79
4 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gestion/gest_crans.py
View file

@ -21,13 +21,13 @@ Retournent None si pas d'objet trouv
# Destinataires, si vide n'envoi rien
To = 'fred@crans.org'
import string, os, sys, pwd
import string, os, sys
from whos import aff
import time, signal, getopt
import affich_tools, config
from lock import make_lock, remove_lock
from ldap_crans import adherent, machine, crans_ldap, crans, club, blacklist_items, isadm, isdeconnecteur, ann_scol, droits_possibles, smtpserv
from ldap_crans import adherent, machine, crans_ldap, crans, club, blacklist_items, isadm, isdeconnecteur, ann_scol, droits_possibles, smtpserv, script_utilisateur
def dialog(arg) :
return affich_tools.dialog(u'Gestion des adhérents et machines du Crans',arg)
@ -639,7 +639,7 @@ def set_blackliste(clas) :
# Commentaire
c = r[2].strip()
login = pwd.getpwuid(os.getuid())[0]
login = script_utilisateur
if c.split(' :')[0] != login :
t[3] = login + ' : ' + c
@ -1576,7 +1576,7 @@ if __name__ == '__main__' :
try :
if To :
# Paramètres pour le mail
From = pwd.getpwuid(os.getuid())[0] + '@crans.org'
From = script_utilisateur + '@crans.org'
entete_mail = """From: Crans <%s>
To: %s