From adf6f79c05e3ebba3344f7100a9e93b18e95c836 Mon Sep 17 00:00:00 2001 From: bernat Date: Thu, 21 Apr 2005 12:23:38 +0200 Subject: [PATCH] =?UTF-8?q?On=20inclue=20les=20invit=C3=A9s=20dans=20la=20?= =?UTF-8?q?liste=20des=20machines?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit darcs-hash:20050421102338-d1718-8a41e75ebb5ef02032a4e2f2ca17c75e6c7dffd9.gz --- gestion/gen_confs/generate.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gestion/gen_confs/generate.py b/gestion/gen_confs/generate.py index acb5be04..8ba45d3d 100755 --- a/gestion/gen_confs/generate.py +++ b/gestion/gen_confs/generate.py @@ -17,7 +17,7 @@ import sys, signal, os, commands, getopt, smtplib, shutil sys.path.append('/usr/scripts/gestion') -from ldap_crans import crans_ldap, crans, smtpserv, hostname +from ldap_crans import crans_ldap, crans, smtpserv, hostname, invite from lock import * from affich_tools import anim, cprint, OK, ERREUR, WARNING from time import localtime, strftime, time, sleep @@ -472,6 +472,8 @@ if inst : cprint('Lecture base LDAP','gras') # Machines de l'assoce machines = crans(db.conn).machines() + # Machines des invités + machines += invite(db.conn).machines() # Machines des adhérents et clubs de l'année en cours base = db.search('paiement=ok') base = base['adherent'] + base['club']