diff options
| author | Yaakov M. Nemoy <loupgaroublond@gmail.com> | 2009-01-05 13:50:32 -0500 |
|---|---|---|
| committer | Yaakov M. Nemoy <loupgaroublond@gmail.com> | 2009-01-05 13:50:32 -0500 |
| commit | de3320e82e5a14fe54ebb27a0ef0c0cb381128f4 (patch) | |
| tree | 131e399b7a1391fcb368396c2c931c2d11b9ac04 /modules/build.py | |
| parent | 5cada39e063281f8f0be7a55f4ce2d30ae5432a9 (diff) | |
| download | fedora-devshell-de3320e82e5a14fe54ebb27a0ef0c0cb381128f4.tar.gz fedora-devshell-de3320e82e5a14fe54ebb27a0ef0c0cb381128f4.tar.xz fedora-devshell-de3320e82e5a14fe54ebb27a0ef0c0cb381128f4.zip | |
fixed package to differentiate between canonical name and rpm name
Diffstat (limited to 'modules/build.py')
| -rw-r--r-- | modules/build.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/modules/build.py b/modules/build.py index 5481507..f5f7e66 100644 --- a/modules/build.py +++ b/modules/build.py @@ -39,20 +39,20 @@ class Build(Directory): def setup_source(self, package): pkg = DirFactory(package) with pwd(pkg.dir): - symlink(pkg.spec_file, + symlink(pkg.spec_file, join(self.dir, 'SPECS', pkg.spec_file())) sball = pkg.cfg['sourceball'] symlink(sball, join(self.dir, 'SOURCES', sball)) patches = [f for f in listdir(getcwd()) if f.endswith('.patch')] for patch in patches: symlink(patch, join(self.dir, 'SOURCES', patch)) - + def build_quick_rpm(self): self.rpmbuild('-ba') def build_source_rpm(self): self.rpmbuild('-bs') - + def rpmbuild(self, param, package, profile=None): pkg = DirFactory(package) if profile: @@ -63,14 +63,14 @@ class Build(Directory): with pwd(pkg.dir): with log_file('rpmbuild.log') as rpm_out: with pwd(join(self.dir, 'SPECS')): - p = Popen(['rpmbuild', - defines, param, - pkg.spec_file], + p = Popen(['rpmbuild', + defines, param, + pkg.spec_file], stdout=rpm_out, stderr=rpm_out) - log.info('building %s... please wait' + log.info('building %s... please wait' % pkg.spec_file) - p.wait() - + p.wait() + def fetch_rpms(self): with pwd(self.dir): for path, dirs, files in walk('.'): @@ -79,11 +79,11 @@ class Build(Directory): #TODO: Gotta figure out what should be FEDORA_DIR # Probably something involving "Project" or i dunno what move(join(path, f), join(FEDORA_DIR, f)) - + def fetch_build(self, package): pkg = DirFactory(package) with pwd(self.dir): source = pkg.cfg['source'] move(join('BUILD', source), join(pkg.dir, 'results')) - + __all__ = ['Build'] |
