From 61b843256f9ceaf81c057cec1e60e88199efc495 Mon Sep 17 00:00:00 2001 From: Tomas Kopecek Date: Tue, 10 May 2022 10:58:36 +0200 Subject: [PATCH] call git rev-parse before chowning source directory Fixes: https://pagure.io/koji/issue/3351 --- builder/kojid | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builder/kojid b/builder/kojid index 522b82f4..a2024256 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),