From: Jay S. Bryant <jsbryant@us.ibm.com>
Date: Fri, 26 Jun 2015 20:56:47 +0000 (-0500)
Subject: Sync the latest fileutils module from oslo-incubator
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=00bbdd59f1d2d1ac535bb02479bd99afb2f2fa76;p=openstack-build%2Fcinder-build.git

Sync the latest fileutils module from oslo-incubator

As part of our normal development in a release we should get
our openstack/common directory code synced up with the latest
code in oslo-incubator.  This is the sync for fileutils:

Current HEAD in OSLO:
---------------------
commit 2e41adeb4c19114fd3504eb69891e9149dba7072
Date:   Wed Jun 24 14:45:25 2015 +0000
Updated from global requirements

Changes merged with this patch:
---------------------
16eb642eb -- Clean up logging to conform to guidelines

Change-Id: I2cfdb7ca1f876cdb8f0deae5a82484409c0b40cc
---

diff --git a/cinder/openstack/common/fileutils.py b/cinder/openstack/common/fileutils.py
index 9097c35d4..1191ce8f4 100644
--- a/cinder/openstack/common/fileutils.py
+++ b/cinder/openstack/common/fileutils.py
@@ -61,7 +61,7 @@ def read_cached_file(filename, force_reload=False):
     cache_info = _FILE_CACHE.setdefault(filename, {})
 
     if not cache_info or mtime > cache_info.get('mtime', 0):
-        LOG.debug("Reloading cached file %s" % filename)
+        LOG.debug("Reloading cached file %s", filename)
         with open(filename) as fap:
             cache_info['data'] = fap.read()
         cache_info['mtime'] = mtime