Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: pym/repoman/
Date: Mon, 28 Feb 2011 20:39:27
Message-Id: afd70ceacf522efeb64ea0cbf4626c7533e2c021.zmedico@gentoo
1 commit: afd70ceacf522efeb64ea0cbf4626c7533e2c021
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 28 20:37:22 2011 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 28 20:37:22 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=afd70cea
7
8 repoman: variable.usedwithhelpers ignore quoted
9
10 ---
11 pym/repoman/checks.py | 4 +++-
12 1 files changed, 3 insertions(+), 1 deletions(-)
13
14 diff --git a/pym/repoman/checks.py b/pym/repoman/checks.py
15 index 566984a..200b542 100644
16 --- a/pym/repoman/checks.py
17 +++ b/pym/repoman/checks.py
18 @@ -333,7 +333,9 @@ class NoOffsetWithHelpers(LineCheck):
19 helpers """
20
21 repoman_check_name = 'variable.usedwithhelpers'
22 - re = re.compile(r'^[^#]*\b(dodir|dohard|exeinto|insinto|into)\s+"?\$\{?(D|ROOT|ED|EROOT|EPREFIX)\b.*')
23 + # Ignore matches in quoted strings like this:
24 + # elog "installed into ${ROOT}usr/share/php5/apc/."
25 + re = re.compile(r'^[^#"\']*\b(dodir|dohard|exeinto|insinto|into)\s+"?\$\{?(D|ROOT|ED|EROOT|EPREFIX)\b.*')
26 error = errors.NO_OFFSET_WITH_HELPERS
27
28 class ImplicitRuntimeDeps(LineCheck):