Page MenuHomePhorge
Files F117750292

No OneTemporary
Actions

Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/pykolab/cli/cmd_list_domains.py b/pykolab/cli/cmd_list_domains.py
index cf12ee4..fd2c7da 100644
--- a/pykolab/cli/cmd_list_domains.py
+++ b/pykolab/cli/cmd_list_domains.py
@@ -1,51 +1,52 @@
# -*- coding: utf-8 -*-
# Copyright 2010-2012 Kolab Systems AG (http://www.kolabsys.com)
#
# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Library General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
import commands
import pykolab
from pykolab.translate import _
-from pykolab import wap_client
log = pykolab.getLogger('pykolab.cli')
conf = pykolab.getConf()
def __init__():
commands.register('list_domains', execute, description="List Kolab domains.")
def execute(*args, **kw):
+ from pykolab import wap_client
# Create the authentication object.
# TODO: Binds with superuser credentials!
wap_client.authenticate()
domains = wap_client.domains_list()
- #print "domains:", domains['list']
+ dna = conf.get('ldap', 'domain_name_attribute')
print "%-39s %-40s" % ("Primary Domain Name Space","Secondary Domain Name Space(s)")
# TODO: Take a hint in --quiet, and otherwise print out a nice table
# with headers and such.
- for domain_dn in domains['list'].keys():
- if isinstance(domains['list'][domain_dn]['associateddomain'], list):
- print domains['list'][domain_dn]['associateddomain'][0]
- for domain_alias in domains['list'][domain_dn]['associateddomain'][1:]:
- print "%-39s %-40s" % ('', domain_alias)
- else:
- print domains['list'][domain_dn]['associateddomain']
+ if isinstance(domains['list'], dict):
+ for domain_dn in domains['list'].keys():
+ if isinstance(domains['list'][domain_dn][dna], list):
+ print domains['list'][domain_dn][dna][0]
+ for domain_alias in domains['list'][domain_dn][dna][1:]:
+ print "%-39s %-40s" % ('', domain_alias)
+ else:
+ print domains['list'][domain_dn][dna]

File Metadata

Mime Type
text/x-diff
Expires
Sat, Apr 4, 2:13 AM (1 w, 3 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
18822105
Default Alt Text
(2 KB)

Event Timeline