From b60c3909cec2e96e09c664bf7caca4b7b3b6ba54 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Mon, 3 Sep 2012 22:17:06 -0400 Subject: [PATCH] Several hacking compliance fixes. Updates bin/nova-manage and the solidfire driver with several hacking compliance fixes. Makes it so run_tests.sh -p runs clean again. Change-Id: Iee675cae06acda6a585a77073e773651aab9d5a1 --- bin/cinder-manage | 6 +++--- cinder/volume/solidfire.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/cinder-manage b/bin/cinder-manage index 3b2978b8e..8edcd0e3a 100755 --- a/bin/cinder-manage +++ b/bin/cinder-manage @@ -296,7 +296,7 @@ class ImportCommands(object): (dest, dest_engine) = self._open_session(dest_db) for table_name in table_list: - print (_('Importing table %s...' % table_name)) + print (_('Importing table %s...') % table_name) table = Table(table_name, src_meta, autoload=True) new_row = self._map_table(table) columns = table.columns.keys() @@ -307,7 +307,7 @@ class ImportCommands(object): dest.commit() for table_name in quota_table_list: - print (_('Importing table %s...' % table_name)) + print (_('Importing table %s...') % table_name) table = Table(table_name, src_meta, autoload=True) new_row = self._map_table(table) columns = table.columns.keys() @@ -362,7 +362,7 @@ class ImportCommands(object): if dest_tgts is None: try: dest_tgts = FLAGS.volumes_dir - except: + except Exception: dest_tgts = '%s/volumes' % FLAGS.state_path utils.execute('rsync', '-avz', src_tgts, dest_tgts) diff --git a/cinder/volume/solidfire.py b/cinder/volume/solidfire.py index c042f5e67..132e924a5 100644 --- a/cinder/volume/solidfire.py +++ b/cinder/volume/solidfire.py @@ -276,7 +276,7 @@ class SolidFire(SanISCSIDriver): if len(presets) > 0: if len(presets) > 1: LOG.warning(_('More than one valid preset was ' - 'detected, using %s' % presets[0])) + 'detected, using %s') % presets[0]) qos = self.sf_qos_dict[presets[0]] else: #if there was no preset, look for explicit settings -- 2.45.2