From f0c29e60335fa2ee36795cb08f5b92629ddb620d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com> Date: Wed, 26 Nov 2014 14:30:21 +0100 Subject: [PATCH] slapos.cli info/list: use raw print instead of logger. --- slapos/cli/info.py | 18 +++++++++--------- slapos/cli/list.py | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/slapos/cli/info.py b/slapos/cli/info.py index a1e4b5d66..ebab08e53 100644 --- a/slapos/cli/info.py +++ b/slapos/cli/info.py @@ -61,16 +61,16 @@ def do_info(logger, conf, local): partition_reference=conf.reference, ) except ResourceNotReady: - logger.warning('Instance does not exist or is not ready yet.') - return(2) + print('Instance does not exist or is not ready yet.') + return(3) except NotFoundError: - logger.warning('Instance %s does not exist.', conf.reference) + print('Instance %s does not exist.' % conf.reference) return(2) - 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)) + 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)) diff --git a/slapos/cli/list.py b/slapos/cli/list.py index 228cf85d5..55e8f39bc 100644 --- a/slapos/cli/list.py +++ b/slapos/cli/list.py @@ -51,8 +51,8 @@ def do_list(logger, conf, local): # XXX catch exception instance_dict = local['slap'].getOpenOrderDict() if instance_dict == {}: - logger.info('No existing service.') + print('No existing service.') return - logger.info('List of services:') + print('List of services:') for title, instance in instance_dict.iteritems(): - logger.info('%s %s', title, instance._software_release_url) + print('%s %s' % title, instance._software_release_url) -- 2.30.9