[copr] master: [backend] put back lost changes from commits d5150cd9 and 53e9af1d from last two days (unwriteable permissions on backend source files which caused faulty rebase, sorry) (6fc8598)

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master commit 6fc85989a86cb4b571a3cb4bb27c527f0e3d0424 Author: clime <clime(a)redhat.com&gt; Date: Wed Feb 17 10:20:29 2016 +0100 [backend] put back lost changes from commits d5150cd9 and 53e9af1d from last two days (unwriteable permissions on backend source files which caused faulty rebase, sorry) backend/backend/actions.py | 3 +++ backend/backend/mockremote/builder.py | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/backend/backend/actions.py b/backend/backend/actions.py index 8048c15..058721e 100644 --- a/backend/backend/actions.py +++ b/backend/backend/actions.py @@ -246,6 +246,9 @@ class Action(object): destdir = os.path.join(chrootdir, build) self.log.debug("Copy directory: {} as {}".format(srcdir, destdir)) shutil.copytree(srcdir, destdir) + + with open(os.path.join(destdir, "build.info"), "a") as f: + f.write("\nfrom_chroot={}".format(data["rawhide_chroot"])) except: result.result = ActionResult.FAILURE diff --git a/backend/backend/mockremote/builder.py b/backend/backend/mockremote/builder.py index 934adc9..41a594a 100644 --- a/backend/backend/mockremote/builder.py +++ b/backend/backend/mockremote/builder.py @@ -187,7 +187,7 @@ class Builder(object): def download_job_pkg_to_builder(self): repo_url = "{}/{}.git".format(self.opts.dist_git_url, self.job.git_repo) self.log.info("Cloning Dist Git repo {}, branch {}, hash {}".format( - self.job.git_repo, self.job.git_hash, self.job.git_branch)) + self.job.git_repo, self.job.git_branch, self.job.git_hash)) results = self._run_ansible( "rm -rf /tmp/build_package_repo && " "mkdir /tmp/build_package_repo && "