| 1 |
idl0r 11/12/04 16:40:10 |
| 2 |
|
| 3 |
Added: gitolite-2.2-gl-system-setup-exit.patch |
| 4 |
Log: |
| 5 |
Version bump to 2.2, bug 391047. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-vcs/gitolite/files/gitolite-2.2-gl-system-setup-exit.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/gitolite/files/gitolite-2.2-gl-system-setup-exit.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/gitolite/files/gitolite-2.2-gl-system-setup-exit.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: gitolite-2.2-gl-system-setup-exit.patch |
| 16 |
=================================================================== |
| 17 |
From ab9d0d2f57ed84c01513053b88587dac82d9ed66 Mon Sep 17 00:00:00 2001 |
| 18 |
From: Sitaram Chamarty <sitaram@×××××××.com> |
| 19 |
Date: Thu, 17 Nov 2011 18:49:24 +0530 |
| 20 |
Subject: [PATCH] a couple of very minor oopsies |
| 21 |
|
| 22 |
(1) c5f342a forgot authkeys can have blank lines also |
| 23 |
|
| 24 |
(2) f0cedeb ended gl-system-install on a non-0 ret code |
| 25 |
|
| 26 |
both caught by matthewtdawson at gmail |
| 27 |
--- |
| 28 |
src/gl-system-install | 4 +++- |
| 29 |
src/sshkeys-lint | 2 +- |
| 30 |
2 files changed, 4 insertions(+), 2 deletions(-) |
| 31 |
|
| 32 |
diff --git a/src/gl-system-install b/src/gl-system-install |
| 33 |
index 0eec005..d7df7e4 100755 |
| 34 |
--- a/src/gl-system-install |
| 35 |
+++ b/src/gl-system-install |
| 36 |
@@ -108,8 +108,10 @@ gl-setup is not in your \$PATH. |
| 37 |
$path_advice" |
| 38 |
|
| 39 |
which=`dirname $which` |
| 40 |
-[ "$which" != "$gl_bin_dir" ] && die " ***** WARNING ***** |
| 41 |
+[ "$which" = "$gl_bin_dir" ] || die " ***** WARNING ***** |
| 42 |
$which precedes $gl_bin_dir in your \$PATH, |
| 43 |
and it *also* contains gl-setup. This is almost certainly going to confuse |
| 44 |
you or me later. |
| 45 |
$path_advice" |
| 46 |
+ |
| 47 |
+exit 0 |
| 48 |
diff --git a/src/sshkeys-lint b/src/sshkeys-lint |
| 49 |
index bcb8f7b..96c027f 100755 |
| 50 |
--- a/src/sshkeys-lint |
| 51 |
+++ b/src/sshkeys-lint |
| 52 |
@@ -119,7 +119,7 @@ sub ak_comment { |
| 53 |
$in_gl_section = 1 if /^# gitolite start/; |
| 54 |
$in_gl_section = 0 if /^# gitolite end/; |
| 55 |
die "gitosis? what's that?\n" if /^#.*gitosis/; |
| 56 |
- return /^\s*#/; |
| 57 |
+ return /^\s*(#|$)/; |
| 58 |
} |
| 59 |
|
| 60 |
sub fprint { |
| 61 |
-- |
| 62 |
1.7.5.4 |
Archives