From d8879e74458935919a4303f4fd1d2d24eb92e094 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 7 Nov 2019 21:42:16 -0800 Subject: Revert "repoman: fix unsafe string interpolation (bug 699508)" This reverts commit d156784fd7557e8f5ce8a6de5cd3a6a38a78e436. The 'on line: %d' string fails to match some messages. Reported-by: Arfrever Frehtes Taifersar Arahesis Bug: https://bugs.gentoo.org/699508 Signed-off-by: Zac Medico --- repoman/lib/repoman/modules/linechecks/controller.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'repoman/lib/repoman/modules/linechecks/controller.py') diff --git a/repoman/lib/repoman/modules/linechecks/controller.py b/repoman/lib/repoman/modules/linechecks/controller.py index b468e348d3d..7082a5d02a1 100644 --- a/repoman/lib/repoman/modules/linechecks/controller.py +++ b/repoman/lib/repoman/modules/linechecks/controller.py @@ -1,6 +1,4 @@ -from __future__ import unicode_literals - import logging import operator import os @@ -138,8 +136,7 @@ class LineCheckController(object): if not ignore or not ignore.match(line): e = lc.check(num, line) if e: - # String interpolation on the variable e is unsafe because it can contain % characters. - yield lc.repoman_check_name, e.replace('on line: %d', 'on line: %d' % strnum + 1) + yield lc.repoman_check_name, e % (num + 1) for lc in checks: i = lc.end() -- cgit v1.2.3-59-g8ed1b