YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[fix] Remove useless raw argument in domain_list

Browse source
This commit is contained in:
Jérôme Lebleu 2015-12-06 12:42:29 +01:00
parent 5676de11da
commit a557956a47
2 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/actionsmap/yunohost.yml
View file

@ -243,10 +243,6 @@ domain:
authenticate: all
authenticator: ldap-anonymous
arguments:
-r:
full: --raw
help: Return domains as a bash-usable list instead of JSON
action: store_true
-f:
full: --filter
help: LDAP filter used to search

9
src/yunohost/domain.py
View file

@ -39,12 +39,11 @@ from moulinette.utils.log import getActionLogger
logger = getActionLogger('yunohost.domain')
def domain_list(auth, raw=False, filter=None, limit=None, offset=None):
def domain_list(auth, filter=None, limit=None, offset=None):
"""
List domains
Keyword argument:
raw -- Return domains as a bash-usable list instead of JSON
filter -- LDAP filter used to search
offset -- Starting number for domain fetching
limit -- Maximum number of domain fetched
@ -66,11 +65,7 @@ def domain_list(auth, raw=False, filter=None, limit=None, offset=None):
for domain in result[offset:offset+limit]:
result_list.append(domain['virtualdomain'][0])
if raw:
for domain in result_list:
print domain
else:
return { 'domains': result_list }
return { 'domains': result_list }
def domain_add(auth, domain, dyndns=False):