Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
slapos.core
Commits
495599e2
Commit
495599e2
authored
Nov 27, 2014
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "slapos.cli info/list: use raw print instead of logger."
This reverts commit
f0c29e60
.
parent
cb576b62
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
slapos/cli/info.py
slapos/cli/info.py
+9
-9
slapos/cli/list.py
slapos/cli/list.py
+3
-3
No files found.
slapos/cli/info.py
View file @
495599e2
...
...
@@ -61,16 +61,16 @@ def do_info(logger, conf, local):
partition_reference
=
conf
.
reference
,
)
except
ResourceNotReady
:
print
(
'Instance does not exist or is not ready yet.'
)
return
(
3
)
logger
.
warning
(
'Instance does not exist or is not ready yet.'
)
return
(
2
)
except
NotFoundError
:
print
(
'Instance %s does not exist.'
%
conf
.
reference
)
logger
.
warning
(
'Instance %s does not exist.'
,
conf
.
reference
)
return
(
2
)
print
(
'Software Release URL: %s'
%
instance
.
_software_release_url
)
print
(
'Instance state: %s'
%
instance
.
_requested_state
)
print
(
'Instance parameters:'
)
print
(
pprint
.
pformat
(
instance
.
_parameter_dict
))
print
(
'Connection parameters:'
)
print
(
pprint
.
pformat
(
instance
.
_connection_dict
))
logger
.
info
(
'Software Release URL: %s'
,
instance
.
_software_release_url
)
logger
.
info
(
'Instance state: %s'
,
instance
.
_requested_state
)
logger
.
info
(
'Instance parameters:'
)
logger
.
info
(
pprint
.
pformat
(
instance
.
_parameter_dict
))
logger
.
info
(
'Connection parameters:'
)
logger
.
info
(
pprint
.
pformat
(
instance
.
_connection_dict
))
slapos/cli/list.py
View file @
495599e2
...
...
@@ -51,8 +51,8 @@ def do_list(logger, conf, local):
# XXX catch exception
instance_dict
=
local
[
'slap'
].
getOpenOrderDict
()
if
instance_dict
==
{}:
print
(
'No existing service.'
)
logger
.
info
(
'No existing service.'
)
return
print
(
'List of services:'
)
logger
.
info
(
'List of services:'
)
for
title
,
instance
in
instance_dict
.
iteritems
():
print
(
'%s %s'
%
title
,
instance
.
_software_release_url
)
logger
.
info
(
'%s %s'
,
title
,
instance
.
_software_release_url
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment