packages: gitolite/gitolite.spec, gitolite/gitolite-nogitweb.patch (NEW) - ...

[draenog]

Author: draenog                      Date: Sat Jan 28 15:01:40 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix 'open /home/users/gitolite/projects.list failed:' error when 
  $GL_NO_DAEMON_NO_GITWEB is set

---- Files affected:
packages/gitolite:
   gitolite.spec (1.30 -> 1.31) , gitolite-nogitweb.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gitolite/gitolite.spec
diff -u packages/gitolite/gitolite.spec:1.30 packages/gitolite/gitolite.spec:1.31
--- packages/gitolite/gitolite.spec:1.30	Mon Jan 16 16:28:50 2012
+++ packages/gitolite/gitolite.spec	Sat Jan 28 16:01:35 2012
@@ -7,7 +7,7 @@
 Summary(pl.UTF-8):	Narzędzie do hostowania repozytoriów git
 Name:		gitolite
 Version:	2.2.1
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Development/Tools
 Source0:	http://github.com/sitaramc/gitolite/tarball/v%{version}/%{name}-%{version}.tar.gz
@@ -18,6 +18,7 @@
 Patch3:		%{name}-broken_links.patch
 Patch4:		%{name}-gl_setup.patch
 Patch5:		%{name}-wildcard_repos.patch
+Patch6:         %{name}-nogitweb.patch
 URL:		http://github.com/sitaramc/gitolite
 BuildRequires:	perl-Text-Markdown
 BuildRequires:	rpm-perlprov
@@ -71,6 +72,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 rm src/gl-system-install
 
@@ -131,6 +133,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2012/01/28 15:01:35  draenog
+- fix 'open /home/users/gitolite/projects.list failed:' error when
+  $GL_NO_DAEMON_NO_GITWEB is set
+
 Revision 1.30  2012/01/16 15:28:50  draenog
 - up to 2.2.1
 

================================================================
Index: packages/gitolite/gitolite-nogitweb.patch
diff -u /dev/null packages/gitolite/gitolite-nogitweb.patch:1.1
--- /dev/null	Sat Jan 28 16:01:41 2012
+++ packages/gitolite/gitolite-nogitweb.patch	Sat Jan 28 16:01:35 2012
@@ -0,0 +1,26 @@
+commit b296e58b1b2b9af87b28c9decfd2642fa42e8165
+Author: Kacper Kornet <draenog at pld-linux.org>
+Date:   Sat Jan 28 14:46:14 2012 +0000
+
+    Do not attempt to modify $PROJECTS_LIST when $GL_NO_DAEMON_NO_GITWEB
+    
+    File $PROJECTS_LIST is not created when $GL_NO_DAEMON_NO_GITWEB is set,
+    so add_del_web_access should not try to modify the file in this case.
+
+diff --git a/src/gitolite.pm b/src/gitolite.pm
+index 4d5f9e2..54f5e6b 100644
+--- a/src/gitolite.pm
++++ b/src/gitolite.pm
+@@ -507,10 +507,10 @@ sub add_del_web_access {
+     # to determine whether to add or delete the repo from web access.
+     # However, "desc" also factors into this so we have think about this.
+     if ($WEB_INTERFACE eq 'gitweb') {
+-
++      unless($GL_NO_DAEMON_NO_GITWEB) {
+         my $repo = shift;
+         add_del_line ("$repo.git", $PROJECTS_LIST, setup_gitweb_access($repo, '', '') || 0, $GITWEB_URI_ESCAPE || 0);
+-
++      }
+     } else {
+         warn "sorry, unknown web interface $WEB_INTERFACE\n";
+     }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gitolite/gitolite.spec?r1=1.30&r2=1.31&f=u