Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cc-cli
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
cc-cli
Commits
4964773f
Commit
4964773f
authored
13 years ago
by
Seblu
Browse files
Options
Downloads
Patches
Plain Diff
Fix new list option of rpccall conflict with list option of migrate command
parent
3e88e47d
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cccli/command.py
+5
-5
5 additions, 5 deletions
cccli/command.py
cccli/commands/right.py
+1
-1
1 addition, 1 deletion
cccli/commands/right.py
with
6 additions
and
6 deletions
cccli/command.py
+
5
−
5
View file @
4964773f
...
...
@@ -295,7 +295,7 @@ class TqlCommand(RemoteCommand):
_tql_print: print tql with filter
_exception: catch or not RPCError exception
_direct: call directly, no listing before
_list: list of arg which are added to
call
arg one by one (=> multiple call)
_arg
_list: list of arg which are added to arg
s
one by one (=> multiple call)
'''
# set rpccall default option value
...
...
@@ -307,7 +307,7 @@ class TqlCommand(RemoteCommand):
"
tql_index
"
:
1
,
"
tql_print
"
:
False
,
"
callback
"
:
None
,
"
list
"
:
[],
"
arg_
list
"
:
[],
}
# check for options modifiers
for
o
in
_options
.
keys
():
...
...
@@ -338,9 +338,9 @@ class TqlCommand(RemoteCommand):
def
_unsecure_rpccall
(
self
,
_options
,
args
,
kwargs
):
'''
Just call an RPC without checking before
'''
try
:
# list mode call command for each argument
#
arg_
list mode call command for each argument
# return is returned as a list
if
len
(
_options
[
"
list
"
])
==
0
:
if
len
(
_options
[
"
arg_
list
"
])
==
0
:
d
=
self
.
rpc
.
call
(
*
args
,
**
kwargs
)
if
_options
[
"
callback
"
]
is
not
None
:
_options
[
"
callback
"
](
d
)
...
...
@@ -348,7 +348,7 @@ class TqlCommand(RemoteCommand):
self
.
print_objects
(
d
,
[
"
output
"
],
index
=
_options
[
"
index
"
])
else
:
d
=
[]
for
arg
in
_options
[
"
list
"
]:
for
arg
in
_options
[
"
arg_
list
"
]:
args2
=
args
+
[
arg
]
r
=
self
.
rpc
.
call
(
*
args2
,
**
kwargs
)
d
.
append
(
r
)
...
...
This diff is collapsed.
Click to expand it.
cccli/commands/right.py
+
1
−
1
View file @
4964773f
...
...
@@ -99,7 +99,7 @@ class Command_delright(TqlCommand):
if
"
*
"
in
self
.
args
[
1
:]:
self
.
rpccall
(
"
delright
"
,
self
.
args
[
0
],
None
)
else
:
self
.
rpccall
(
"
delright
"
,
self
.
args
[
0
],
_list
=
l
)
self
.
rpccall
(
"
delright
"
,
self
.
args
[
0
],
_arg
_list
=
l
)
def
remote_functions
(
self
):
return
set
((
'
delright
'
,))
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment