particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge cleanup. drop make_sources arg, use source_cmd=None instead.

Browse source
This commit is contained in:
Mike McLean 2010-06-29 10:28:34 -04:00
parent d4cc2223da
commit 5f91ab02d6
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
builder/kojid
View file

@ -545,9 +545,9 @@ class BuildRoot(object):
msg = '; see %s for more information' % logfile
return _parseStatus(rv, 'mock') + msg
def build_srpm(self, specfile, sourcedir, source_cmd, make_sources=True):
def build_srpm(self, specfile, sourcedir, source_cmd):
session.host.setBuildRootState(self.id,'BUILDING')
if source_cmd and make_sources:
if source_cmd:
# call the command defined by source_cmd in the chroot so any required files not stored in
# the SCM can be retrieved
chroot_sourcedir = sourcedir[len(self.rootdir()):]
@ -2687,7 +2687,7 @@ class WrapperRPMTask(BaseTaskHandler):
#build srpm
self.logger.debug("Running srpm build")
buildroot.build_srpm(specfile, specdir, make_sources=False)
buildroot.build_srpm(specfile, specdir, None)
srpms = glob.glob('%s/*.src.rpm' % buildroot.resultdir())
if len(srpms) == 0: