equal
deleted
inserted
replaced
459 if not isinstance(force, bool): |
459 if not isinstance(force, bool): |
460 raise TypeError('force must be a bool') |
460 raise TypeError('force must be a bool') |
461 dom = self._get_domain(domainname) |
461 dom = self._get_domain(domainname) |
462 gid = dom.gid |
462 gid = dom.gid |
463 domdir = dom.directory |
463 domdir = dom.directory |
464 if self._cfg.dget('domain.force_deletion') or force: |
464 if force or self._cfg.dget('domain.force_deletion'): |
465 dom.delete(True) |
465 dom.delete(True) |
466 else: |
466 else: |
467 dom.delete(False) |
467 dom.delete(False) |
468 if del_dir or self._cfg.dget('domain.delete_directory'): |
468 if del_dir or self._cfg.dget('domain.delete_directory'): |
469 self._delete_domain_dir(domdir, gid) |
469 self._delete_domain_dir(domdir, gid) |