diff options
Diffstat (limited to 'devshell/modules/mock.py')
| -rw-r--r-- | devshell/modules/mock.py | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/devshell/modules/mock.py b/devshell/modules/mock.py index f9aa78b..2d32aaf 100644 --- a/devshell/modules/mock.py +++ b/devshell/modules/mock.py @@ -19,20 +19,24 @@ from __future__ import with_statement from subprocess import Popen +import devshell.base.validators as validators + from devshell.base.base import log from devshell.base.module import Module from devshell.base.util import pwd, log_file -from devshell.modules.build import Build +from devshell.modules.build import Build, BuildValidator from devshell.modules.directory import DirFactory -from devshell.modules.package import Package -from devshell.modules.profile import Profile +from devshell.modules.package import Package, PackageValidator +from devshell.modules.profile import Profile, ProfileValidator class Builder(Module): pass class Mock(Builder): '''wrapper around mock for integrating with profiles and packages''' + @validators.validate(ProfileValidator(1)) + @validators.validate(BuildValidator(2)) def init(self, profile, build): '''initializer @@ -40,11 +44,12 @@ class Mock(Builder): build is a path to a buildroot directory ''' Builder.init(self) - self.builder = Build(build) - self.profile = Profile(profile) + self.builder = build + self.profile = profile + @validators.validate(PackageValidator(1)) def build(self, package): - pkg = DirFactory(package) + pkg = package srpm_name = pkg.get_srpm_name(self.profile) mock_cfg = self.profile.mock_cfg @@ -64,9 +69,10 @@ class Mock(Builder): log.info('mock compiling %s... please wait' % srpm_name) p.communicate() + @validators.validate(PackageValidator(1)) def build_rpm(self, package): '''builds an rpm from some package''' - pkg = DirFactory(package) + pkg = package self.builder.setup_source(package) self.builder.build_source_rpm(package, self.profile) |
