rpms/viewvc/F-12 viewvc-1.1.3-config.patch, NONE, 1.1 viewvc.spec, 1.26, 1.27

[bojan]

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18336

Modified Files:
	viewvc.spec 
Added Files:
	viewvc-1.1.3-config.patch 
Log Message:
Patch upstream issue #445.

viewvc-1.1.3-config.patch:
 config.py |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

--- NEW FILE viewvc-1.1.3-config.patch ---
--- branches/1.1.x/lib/config.py	2010-01-07 07:56:29-0800	2316
+++ branches/1.1.x/lib/config.py	2010-01-07 08:08:31-0800	2317
@@ -274,9 +274,7 @@
     """Overlay per-root options for ROOTNAME atop the existing option
     set.  This is a destructive change to the configuration."""
 
-    # We can only deal with this happening once!
-    assert(self.root_options_overlayed == 0)
-    self.root_options_overlayed = 1
+    did_overlay = 0
     
     if not self.conf_path:
       return
@@ -285,7 +283,17 @@
       base_section = self._is_allowed_override(self.parser, 'root',
                                                rootname, section)
       if base_section:
+        # We can currently only deal with root overlays happening
+        # once, so check that we've not yet done any overlaying of
+        # per-root options.
+        assert(self.root_options_overlayed == 0)
         self._process_section(self.parser, section, base_section)
+        did_overlay = 1
+
+    # If we actually did any overlaying, remember this fact so we
+    # don't do it again later.
+    if did_overlay:
+      self.root_options_overlayed = 1
 
   def _get_parser_items(self, parser, section):
     """Basically implement ConfigParser.items() for pre-Python-2.3 versions."""


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/F-12/viewvc.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- viewvc.spec	22 Dec 2009 21:45:12 -0000	1.26
+++ viewvc.spec	7 Jan 2010 21:22:02 -0000	1.27
@@ -2,7 +2,7 @@
 
 Name:           viewvc
 Version:        1.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
 Group:          Development/Tools
@@ -12,6 +12,7 @@ Source0:        http://www.viewvc.org/%{
 Source1:        viewvc.conf
 Source2:        README.httpd
 Source3:        viewvc-lexer-mimetypes.py
+Patch1:         viewvc-1.1.3-config.patch 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes:      %{name}-selinux < 1.0.3-13
@@ -43,6 +44,7 @@ with decent performance when run under A
 
 %prep
 %setup -q
+%patch1 -p2 -b .config
 
 %build
 
@@ -118,6 +120,9 @@ with decent performance when run under A
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
 
 %changelog
+* Fri Jan  8 2010 Bojan Smojver <bojan at rexursive.com> - 1.1.3-2
+- patch upstream issue #445
+
 * Wed Dec 23 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.3-1
 - bump up to 1.1.3
 - drop patch for upstream issue #427