Projet

Général

Profil

patch.diff

Emmanuel GARETTE, 30/07/2013 15:00

Télécharger (3,1 ko)

Voir les différences:

pyeole/bacula.py
229 229
        raise Disabled(u'Bacula sd désactivé')
230 230
    if usb_path == None:
231 231
        raise Exception(u'Chemin usb inconnu')
232
    config = creole_loader('bacula', rw=True)
232
    config = creole_loader(namespace='bacula', rw=True)
233 233
    config.bacula.support.support_type = u'usb'
234 234
    config.bacula.support.usb_path = unicode(usb_path)
235 235
    if not config_save_values(config, 'bacula'):
......
243 243
    if smb_machine == None or smb_ip  == None or smb_partage == None:
244 244
        raise Exception(u'Nom machine, IP ou nom du partage inconnu')
245 245

  
246
    config = creole_loader('bacula', rw=True)
246
    config = creole_loader(namespace='bacula', rw=True)
247 247
    config.bacula.support.support_type = u'smb'
248 248
    if smb_login != None and smb_password == None:
249 249
        raise Exception(u'Login spécifié mais password absent')
......
261 261
def save_bacula_support_manual():
262 262
    if not bacula_active_sd():
263 263
        raise Disabled(u'Bacula sd désactivé')
264
    config = creole_loader('bacula', rw=True)
264
    config = creole_loader(namespace='bacula', rw=True)
265 265
    config.bacula.support.support_type = u'manual'
266 266
    if not config_save_values(config, 'bacula'):
267 267
        raise Exception(u"Le fichier de configuration n'a pas été enregistré")
......
313 313
def save_bacula_mail(mail_ok=None, mail_error=None):
314 314
    if not bacula_active_dir():
315 315
        raise Disabled(u'Bacula dir désactivé')
316
    config = creole_loader('bacula', rw=True)
316
    config = creole_loader(namespace='bacula', rw=True)
317 317
    config.bacula.mail.mail_ok = unicode(mail_ok)
318 318
    config.bacula.mail.mail_error = unicode(mail_error)
319 319
    if not config_save_values(config, 'bacula'):
......
412 412
            if tday <= day <= tend_day:
413 413
                raise_if_conflict(day, index)
414 414

  
415
    config = creole_loader('bacula', rw=True)
415
    config = creole_loader(namespace='bacula', rw=True)
416 416
    config.bacula.job.job_type.job_type.append(job)
417 417
    config.bacula.job.job_type.level[-1] = level
418 418
    config.bacula.job.job_type.day[-1] = unicode(day)
pyeole/schedule.py
6 6
from pickle import dump, load
7 7
from pyeole.ansiprint import print_orange
8 8
from pyeole.process import system_out
9
from creole.loader import creole_loader
9
from creole.loader import creole_loader, config_save_values
10 10
from creole.client import CreoleClient, CreoleClientError
11 11

  
12 12
## configuration
......
128 128

  
129 129
class ManageSchedule():
130 130
    def __init__(self):
131
        self.config = creole_loader('schedule')
131
        self.config = creole_loader(namespace='schedule')
132 132
        self.config.read_write()
133 133

  
134 134
    def add(self, script, day, mode):