From c8a9c6bde2c93fb768e753d3a6cba729bf893ade Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Nov 02 2017 22:39:03 +0000 Subject: PR#589: fix scratch ref for scm callback Merges #589 https://pagure.io/koji/pull-request/589 --- diff --git a/builder/kojid b/builder/kojid index cd829a8..d137ffa 100755 --- a/builder/kojid +++ b/builder/kojid @@ -4440,13 +4440,13 @@ class BuildSRPMFromSCMTask(BaseBuildTask): logfile = self.workdir + '/checkout.log' uploadpath = self.getUploadDir() - self.run_callbacks('preSCMCheckout', scminfo=scm.get_info(), build_tag=build_tag, scratch=self.opts.get('scratch')) + self.run_callbacks('preSCMCheckout', scminfo=scm.get_info(), build_tag=build_tag, scratch=opts.get('scratch')) # Check out spec file, etc. from SCM sourcedir = scm.checkout(scmdir, self.session, uploadpath, logfile) self.run_callbacks("postSCMCheckout", scminfo=scm.get_info(), build_tag=build_tag, - scratch=self.opts.get('scratch'), + scratch=opts.get('scratch'), srcdir=sourcedir) # chown the sourcedir and everything under it to the mockuser # so we can build the srpm as non-root