diff options
author | Zac Medico <zmedico@gentoo.org> | 2010-03-02 21:06:02 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2010-03-02 21:06:02 +0000 |
commit | e8bd4d149db6e1b151966ac5f46dd474e35b4d6d (patch) | |
tree | 842fb85ed800efec09b617e5ebaa970a1c7ee476 | |
parent | 534c8c841c927bcc1fa5a5ba63be81580c89b5c0 (diff) | |
download | portage-e8bd4d149db6e1b151966ac5f46dd474e35b4d6d.tar.gz portage-e8bd4d149db6e1b151966ac5f46dd474e35b4d6d.tar.bz2 portage-e8bd4d149db6e1b151966ac5f46dd474e35b4d6d.zip |
Eliminate the PhaseCheck constructor and make PhaseCheck.phases_re a class
attribute. Thanks to Sebastian Pipping <sping@g.o> for the initial patch.
(trunk r15470)
svn path=/main/branches/2.1.7/; revision=15679
-rw-r--r-- | pym/repoman/checks.py | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/pym/repoman/checks.py b/pym/repoman/checks.py index 941cb4188..79ba892e6 100644 --- a/pym/repoman/checks.py +++ b/pym/repoman/checks.py @@ -35,17 +35,13 @@ class PhaseCheck(LineCheck): ignore_line = re.compile(r'(^\s*#)') func_end_re = re.compile(r'^\}$') + phases_re = re.compile('(%s)' % '|'.join(( + 'pkg_pretend', 'pkg_setup', 'src_unpack', 'src_prepare', + 'src_configure', 'src_compile', 'src_test', 'src_install', + 'pkg_preinst', 'pkg_postinst', 'pkg_prerm', 'pkg_postrm', + 'pkg_config'))) in_phase = '' - def __init__(self): - self.phases = ('pkg_pretend', 'pkg_setup', 'src_unpack', 'src_prepare', 'src_configure', 'src_compile', - 'src_test', 'src_install', 'pkg_preinst', 'pkg_postinst', 'pkg_prerm', 'pkg_postrm', 'pkg_config') - phase_re = '(' - for phase in self.phases: - phase_re += phase + '|' - phase_re = phase_re[:-1] + ')' - self.phases_re = re.compile(phase_re) - def check(self, num, line): m = self.phases_re.match(line) if m is not None: |