packages: gitolite/gitolite-nogitweb.patch, gitolite/gitolite.spec - upstre...

[draenog]

Author: draenog                      Date: Fri Feb  3 13:00:48 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- upstream version of nogitweb.patch

---- Files affected:
packages/gitolite:
   gitolite-nogitweb.patch (1.1 -> 1.2) , gitolite.spec (1.31 -> 1.32) 

---- Diffs:

================================================================
Index: packages/gitolite/gitolite-nogitweb.patch
diff -u packages/gitolite/gitolite-nogitweb.patch:1.1 packages/gitolite/gitolite-nogitweb.patch:1.2
--- packages/gitolite/gitolite-nogitweb.patch:1.1	Sat Jan 28 16:01:35 2012
+++ packages/gitolite/gitolite-nogitweb.patch	Fri Feb  3 14:00:42 2012
@@ -1,26 +1,74 @@
-commit b296e58b1b2b9af87b28c9decfd2642fa42e8165
-Author: Kacper Kornet <draenog at pld-linux.org>
-Date:   Sat Jan 28 14:46:14 2012 +0000
+commit 1363534d8d01323bb084c13d005ff0993ce19d57
+Author: Sitaram Chamarty <sitaram at atc.tcs.com>
+Date:   Fri Feb 3 06:56:49 2012 +0530
 
-    Do not attempt to modify $PROJECTS_LIST when $GL_NO_DAEMON_NO_GITWEB
+    honor GL_NO_DAEMON_NO_GITWEB for wild repos also
     
-    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.
+    Thanks to Kacper Kornet for catching this...
+    
+    (by the way, there's a simple workaround if you are affected by this but
+    can't upgrade to this commit or later: just create an empty
+    $PROJECTS_LIST file, which is by default ~/projects.list)
 
+diff --git a/doc/big-config.mkd b/doc/big-config.mkd
+index 2aaa61a..31059ed 100644
+--- a/doc/big-config.mkd
++++ b/doc/big-config.mkd
+@@ -2,8 +2,9 @@
+ 
+ This document is just background info; you don't actually need to read the
+ whole thing if you don't care.  All you need to do is set `BIG_CONFIG` to 1 in
+-the rc file and you're done.  If you have no use for gitweb and daemon, you
+-can save even more time by setting `GL_NO_DAEMON_NO_GITWEB`.
++the rc file and you're done.  If you have no use for gitweb, git-daemon, or
++[git config][rsgc], you can save even more time by setting
++`GL_NO_DAEMON_NO_GITWEB`.
+ 
+ Finally, if you're *really* an expert (or your initials are "JK"), you can
+ even set `GL_NO_CREATE_REPOS` and `GL_NO_SETUP_AUTHKEYS`.  However, be warned
+@@ -147,10 +148,10 @@ first one):
+ 
+ `GL_NO_DAEMON_NO_GITWEB` is a very useful optimisation that you *must* enable
+ if you *do* have a large number of repositories, and do *not* use gitolite's
+-support for gitweb or git-daemon access (see "[this][gwd]" for details).  This will save a
+-lot of time when you push the gitolite-admin repo with changes.  This variable
+-also controls whether "git config" lines (such as `config hooks.emailprefix =
+-"[gitolite]"`) will be processed or not.
++support for gitweb or git-daemon access (see "[this][gwd]" for details).  This
++will save a lot of time when you push the gitolite-admin repo with changes.
++This variable also controls whether "git config" lines (such as `config
++hooks.emailprefix = "[gitolite]"`) will be processed or not.
+ 
+ You should be a lot more careful with `GL_NO_CREATE_REPOS` and
+ `GL_NO_SETUP_AUTHKEYS`.  These are meant for installations where some backend
 diff --git a/src/gitolite.pm b/src/gitolite.pm
-index 4d5f9e2..54f5e6b 100644
+index acd7ff0..062706f 100644
 --- a/src/gitolite.pm
 +++ b/src/gitolite.pm
-@@ -507,10 +507,10 @@ sub add_del_web_access {
+@@ -443,6 +443,8 @@ sub get_set_desc
+ 
+ sub setup_git_configs
+ {
++    return if $GL_NO_DAEMON_NO_GITWEB;
++
+     my ($repo, $git_configs_p) = @_;
+ 
+     # new_wild calls us without checking!
+@@ -476,6 +478,8 @@ sub setup_git_configs
+ my $export_ok = "git-daemon-export-ok";
+ sub setup_daemon_access
+ {
++    return if $GL_NO_DAEMON_NO_GITWEB;
++
+     my $repo = shift;
+ 
+     if (can_read($repo, 'daemon')) {
+@@ -507,6 +511,8 @@ sub setup_web_access {
+ }
+ 
+ sub add_del_web_access {
++    return if $GL_NO_DAEMON_NO_GITWEB;
++
+     # input is a repo name.  Code could simply use `can_read($repo, 'gitweb')`
      # 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";
-     }

================================================================
Index: packages/gitolite/gitolite.spec
diff -u packages/gitolite/gitolite.spec:1.31 packages/gitolite/gitolite.spec:1.32
--- packages/gitolite/gitolite.spec:1.31	Sat Jan 28 16:01:35 2012
+++ packages/gitolite/gitolite.spec	Fri Feb  3 14:00:42 2012
@@ -7,7 +7,7 @@
 Summary(pl.UTF-8):	Narzędzie do hostowania repozytoriów git
 Name:		gitolite
 Version:	2.2.1
-Release:	2
+Release:	3
 License:	GPL v2
 Group:		Development/Tools
 Source0:	http://github.com/sitaramc/gitolite/tarball/v%{version}/%{name}-%{version}.tar.gz
@@ -133,6 +133,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2012/02/03 13:00:42  draenog
+- upstream version of nogitweb.patch
+
 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
================================================================

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