Attachment 853250 Details for Bug 1054086 – [PATCH] another way. add tag, when modify buildroot

[patch] [PATCH] another way. add tag, when modify buildroot

0001-mockremote-add-vendor-tag-when-modifying-buildroot.patch (text/plain), 3.03 KB, created by Igor Gnatenko on 2014-01-21 14:10:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Igor Gnatenko

Created: 2014-01-21 14:10:20 UTC

Size: 3.03 KB

patch

obsolete

>From 46bac8f40d9997d75b48dbeb90d55058e635b460 Mon Sep 17 00:00:00 2001
>From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
>Date: Tue, 21 Jan 2014 18:08:46 +0400
>Subject: [PATCH] mockremote: add vendor tag when modifying buildroot
>
>Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
>---
> backend/mockremote.py | 15 +++++++++++----
> 1 file changed, 11 insertions(+), 4 deletions(-)
>
>diff --git a/backend/mockremote.py b/backend/mockremote.py
>index 1f348aa..7fb5851 100755
>--- a/backend/mockremote.py
>+++ b/backend/mockremote.py
>@@ -284,12 +284,20 @@ class Builder(object):
>             raise BuilderError("Do not try this kind of attack on me")
>         self.root_conn.module_name = "lineinfile"
>         if (self.chroot == 'epel-7-x86_64'):
>-            self.root_conn.module_args = """dest=/etc/mock/epel-7-x86_64.cfg line="config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils findutils gawk gcc gcc-c++ grep gzip info make patch redhat-release-server redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz %s'" regexp="^.*chroot_setup_cmd.*$" """ % (self.buildroot_pkgs)
>+            dest="/etc/mock/epel-7-x86_64.cfg"
>+            self.root_conn.module_args = """dest=%s line="config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils findutils gawk gcc gcc-c++ grep gzip info make patch redhat-release-server redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz %s'" regexp="^.*chroot_setup_cmd.*$" """ % (dest, self.buildroot_pkgs)
>         else:
>-            self.root_conn.module_args = """dest=/etc/mock/%s.cfg line="config_opts['chroot_setup_cmd'] = 'install @buildsys-build %s'" regexp="^.*chroot_setup_cmd.*$" """ % (self.chroot, self.buildroot_pkgs)
>+            dest="/etc/mock/%s.cfg" % self.chroot
>+            self.root_conn.module_args = """dest=%s line="config_opts['chroot_setup_cmd'] = 'install @buildsys-build %s'" regexp="^.*chroot_setup_cmd.*$" """ % (dest, self.buildroot_pkgs)
>         self.mockremote.callback.log('putting %s into minimal buildroot of %s' % (self.buildroot_pkgs, self.chroot))
>-        results = self.root_conn.run()
>+        modify_base_buildroot_ans_run()
>+        vendor_tag = "Fedora Project COPR %s" % (self.mockremote.macros.get('copr_username')
>+        self.mockremote.callback.log('putting %s as vendor tag into buildroot of %s' % (vendor_tag, self.chroot))
>+        self.root_conn.module_args = """dest=%s line="config_opts['macros']['%%vendor'] = '%s'" regexp="^.*vendor.*$" """ % (dest, vendor_tag)
>+        modify_base_buildroot_ans_run()
> 
>+    def modify_base_buildroot_ans_run(self)
>+        results = self.root_conn.run()
>         is_err, err_results = check_for_ans_error(results, self.hostname, success_codes=[0],
>                           return_on_error=['stdout', 'stderr'])
>         if is_err:
>@@ -297,7 +305,6 @@ class Builder(object):
>             myresults = get_ans_results(results, self.hostname)
>             self.mockremote.callback.log("%s" % myresults)
> 
>-
>     def build(self, pkg):
> 
>         # build the pkg passed in
>-- 
>1.8.5.3
>

Actions: View | Diff

Attachments on bug 1054086: 853051 | 853053 | 853250