Attachment 845508 Details for Bug 985681 – patch to make package state plugin use new repoquery --installroot option

[patch] patch to make package state plugin use new repoquery --installroot option

repoquery.patch (text/plain), 2.91 KB, created by Clark Williams on 2014-01-04 19:57:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Clark Williams

Created: 2014-01-04 19:57:56 UTC

Size: 2.91 KB

patch

obsolete

>commit 22cf4c6051c8ef69aeb87e233638b51fc52f48ae
>Author: Clark Williams <clark.williams@gmail.com>
>Date:   Sat Jan 4 13:50:20 2014 -0600
>
>    plugin:package_state: use new repoquery option --installroot [BZ# 1029352]
>    
>    use the new (yum-utils >= 1.1.31) repoquery option --installroot
>    to avoid corrupting host yum cache when running mock.
>    
>    Signed-off-by: Clark Williams <clark.williams@gmail.com>
>
>diff --git a/mock.spec.in b/mock.spec.in
>index 3112a7a..a12e0f6 100644
>--- a/mock.spec.in
>+++ b/mock.spec.in
>@@ -21,7 +21,7 @@ Source: https://git.fedorahosted.org/cgit/mock.git/snapshot/%{name}-%{version}.t
> URL: http://fedoraproject.org/wiki/Projects/Mock
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> BuildArch: noarch
>-Requires: python >= 2.6, yum >= 2.4, yum-utils >= 1.1.9, tar, pigz, python-ctypes, python-decoratortools, usermode
>+Requires: python >= 2.6, yum >= 2.4, yum-utils >= 1.1.31, tar, pigz, python-ctypes, python-decoratortools, usermode
> Requires: createrepo
> Requires(pre): shadow-utils
> Requires(post): coreutils
>@@ -144,6 +144,9 @@ ln -s -f $cfg %{_sysconfdir}/%{name}/default.cfg
> %{python_sitelib}/mockbuild/scm.py*
> 
> %changelog
>+* Sat Jan  4 2014 Clark Williams <williams@redhat.com> - 1.1.36-1
>+- first try at using repoquery installroot arg
>+
> * Tue Nov  5 2013 Clark Williams <williams@redhat.com> - 1.1.35-1
> - modified %%post logic to set default config correctly
> 
>diff --git a/py/mockbuild/plugins/package_state.py b/py/mockbuild/plugins/package_state.py
>index b656107..734e1c0 100644
>--- a/py/mockbuild/plugins/package_state.py
>+++ b/py/mockbuild/plugins/package_state.py
>@@ -46,8 +46,9 @@ decorate(traceLog())
>             self.rootObj.uidManager.dropPrivsTemp()
>             self.rootObj.start("Outputting list of available packages")
>             out_file = self.rootObj.resultdir + '/available_pkgs'
>-            cmd = "/usr/bin/repoquery -c %s/etc/yum.conf %s > %s" % (
>-                           self.rootObj.makeChrootPath(), repoquery_avail_opts, out_file)
>+            chrootpath = self.rootObj.makeChrootPath()
>+            cmd = "/usr/bin/repoquery --installroot=%s -c %s/etc/yum.conf %s > %s" % (
>+                           chrootpath, chrootpath, repoquery_avail_opts, out_file)
>             mockbuild.util.do(cmd, shell=True)
>             self.avail_done = True
>             self.rootObj.finish("Outputting list of available packages")
>@@ -63,7 +64,8 @@ decorate(traceLog())
>             fo.flush()
>             fo.close()
>             out_file = self.rootObj.resultdir + '/installed_pkgs'
>-            cmd = "/usr/bin/repoquery -c %s %s > %s" % (fn, repoquery_install_opts, out_file)
>+            cmd = "/usr/bin/repoquery --installroot=%s -c %s %s > %s" % (
>+                self.rootObj.makeChrootPath(), fn, repoquery_install_opts, out_file)
>             mockbuild.util.do(cmd, shell=True, environ=self.rootObj.env)
>             self.inst_done = True
>             os.unlink(fn)

Actions: View | Diff

Attachments on bug 985681: 780136 | 780137 | 845508