summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbst-marge-bot <marge-bot@buildstream.build>2019-03-21 10:03:44 +0000
committerbst-marge-bot <marge-bot@buildstream.build>2019-03-21 10:03:44 +0000
commit62031e8959cad14e88db84558a95a4733f9175f4 (patch)
tree9263fe64d4a1975010b5f062b0211f3352595e8f
parentc398dd774a6ad32d4d23881da7cf084b63476dcb (diff)
parenta934e426a834790019a2b843cba9e18596ec6fff (diff)
downloadbuildstream-62031e8959cad14e88db84558a95a4733f9175f4.tar.gz
Merge branch 'bschubert/lint/logging-format' into 'master'
casserver.py: fix logging-format-interpolation error and enable See merge request BuildStream/buildstream!1248
-rw-r--r--.pylintrc2
-rw-r--r--buildstream/_cas/casserver.py2
2 files changed, 1 insertions, 3 deletions
diff --git a/.pylintrc b/.pylintrc
index 11532bc70..0cdb7586e 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -109,8 +109,6 @@ disable=#####################################
# Messages that report warnings which should be addressed #
###########################################################
- logging-format-interpolation,
-
cyclic-import,
# Enable the message, report, category or checker with the given id(s). You can
diff --git a/buildstream/_cas/casserver.py b/buildstream/_cas/casserver.py
index 5482dae86..8f8ef4efe 100644
--- a/buildstream/_cas/casserver.py
+++ b/buildstream/_cas/casserver.py
@@ -520,7 +520,7 @@ class _CacheCleaner:
self.__cas.clean_up_refs_until(last_mtime)
if removed_size > 0:
- logging.info("Successfully removed {} bytes from the cache".format(removed_size))
+ logging.info("Successfully removed %d bytes from the cache", removed_size)
else:
logging.info("No artifacts were removed from the cache.")