[mrepo/f13/master] Fixed repoview

James Findley sixy at fedoraproject.org
Wed Aug 4 10:07:36 UTC 2010


commit 7eaffe2004bd43412f1a48664e92276a7d73bfa7
Author: James Findley <sixy at gmx.com>
Date:   Wed Aug 4 11:07:20 2010 +0100

    Fixed repoview

 mrepo-repoview_options.patch |   14 ++++++++++++++
 mrepo.spec                   |    8 +++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/mrepo-repoview_options.patch b/mrepo-repoview_options.patch
new file mode 100644
index 0000000..f9c3de7
--- /dev/null
+++ b/mrepo-repoview_options.patch
@@ -0,0 +1,14 @@
+--- mrepo-0.8.7/mrepo	2010-08-04 10:37:52.490515767 +0100
++++ mrepo-0.8.7/mrepo.1	2010-08-04 10:37:44.955549668 +0100
+@@ -928,9 +928,9 @@
+             return
+         if not cf.cmd['repoview']:
+             return
+-        opts = ''
++        opts = ' ' + cf.repoviewoptions
+         if op.force:
+-            opts = ' --force'
++            opts = ' --force' + opts
+         if op.verbose <= 2:
+             opts = ' --quiet' + opts
+         if os.path.exists(self.wwwdir):
diff --git a/mrepo.spec b/mrepo.spec
index 94828ce..ba3820e 100644
--- a/mrepo.spec
+++ b/mrepo.spec
@@ -1,6 +1,6 @@
 Name:		mrepo
 Version:	0.8.7
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A tool to set up a yum/apt mirror from various sources
 License:	GPLv2
 Group:		System Environment/Base
@@ -16,6 +16,8 @@ Patch0:		mrepo-initd.patch
 Patch1:		mrepo-selinux.patch
 # Patch to fix two deprecation warnings with Python 2.6
 Patch2:		mrepo-python26.patch
+#Patch provided by Tom McLaughlin to fix repoview option parsing
+Patch3:     mrepo-repoview_options.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:	noarch
 
@@ -59,6 +61,7 @@ allow installations via the network.
 %patch0 -p1 -b .init
 %patch1 -p1 -b .selinux
 %patch2 -p1 -b .python26
+%patch3 -p1 -b .repoview_options
 
 rm docs/client-configuration.txt
 
@@ -134,6 +137,9 @@ rm -rf %{buildroot}
 %{_localstatedir}/mrepo/
 
 %changelog
+* Wed Aug 04 2010 James Findley <sixy at gmx.com> - 0.8.7-2
+- Patch to fix repoview options (#620788).
+
 * Thu Jul 08 2010 James Findley <sixy at gmx.com> - 0.8.7-1
 - Update to release 0.8.7 (fixes #610140 and #604277).
 - Patch to fix two deprecation warnings on python 2.6.


More information about the scm-commits mailing list