From 904ab88069f23c6f19a7091666d92ebe73956c07 Mon Sep 17 00:00:00 2001 From: Tomas Kopecek Date: May 11 2022 07:43:52 +0000 Subject: PR#3355: call git rev-parse before chowning source directory Merges #3355 https://pagure.io/koji/pull-request/3355 Fixes: #3351 https://pagure.io/koji/issue/3351 git 2.35.2+ breaks buildSRPMFromSCM --- diff --git a/builder/kojid b/builder/kojid index 522b82f..a202425 100755 --- a/builder/kojid +++ b/builder/kojid @@ -5072,6 +5072,8 @@ class BuildSRPMFromSCMTask(BaseBuildTask): scratch=opts.get('scratch'), srcdir=sourcedir, buildroot=broot) + # get the source before chown, git > 2.35.2 would refuse to that later + source = scm.get_source() # chown the sourcedir and everything under it to the mockuser # so we can build the srpm as non-root uid = pwd.getpwnam(self.options.mockuser)[2] @@ -5143,7 +5145,6 @@ class BuildSRPMFromSCMTask(BaseBuildTask): brootid = broot.id log_files = glob.glob('%s/*.log' % broot.resultdir()) - source = scm.get_source() broot.expire() return {'srpm': "%s/%s" % (uploadpath, srpm_name),