From: Jenkins Date: Wed, 19 Nov 2014 23:41:01 +0000 (+0000) Subject: Merge "Amend unused variables to assist pylint testing" X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=cef588d2d13a829e0699215cef2c572237321c4a;p=openstack-build%2Fcinder-build.git Merge "Amend unused variables to assist pylint testing" --- cef588d2d13a829e0699215cef2c572237321c4a diff --cc cinder/brick/local_dev/lvm.py index 252fa05d0,205c2db03..562fd761a --- a/cinder/brick/local_dev/lvm.py +++ b/cinder/brick/local_dev/lvm.py @@@ -253,12 -249,12 +253,12 @@@ class LVM(executor.Executor) cmd.append(vg_name) lvs_start = time.time() - (out, err) = putils.execute(*cmd, - root_helper=root_helper, - run_as_root=True) + (out, _err) = putils.execute(*cmd, + root_helper=root_helper, + run_as_root=True) total_time = time.time() - lvs_start if total_time > 60: - LOG.warning(_('Took %s seconds to get logical volumes.'), + LOG.warning(_LW('Took %s seconds to get logical volumes.'), total_time) lv_list = [] @@@ -362,13 -344,12 +362,13 @@@ cmd.append(vg_name) start_vgs = time.time() - (out, err) = putils.execute(*cmd, - root_helper=root_helper, - run_as_root=True) + (out, _err) = putils.execute(*cmd, + root_helper=root_helper, + run_as_root=True) total_time = time.time() - start_vgs if total_time > 60: - LOG.warning(_('Took %s seconds to get volume groups.'), total_time) + LOG.warning(_LW('Took %s seconds to get ' + 'volume groups.'), total_time) vg_list = [] if out is not None: