From: Ian Jackson Date: Wed, 26 Apr 2017 12:03:14 +0000 (+0100) Subject: Merge remote-tracking branch 'mariner/master' X-Git-Tag: archive/debian/6.0.0~14 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=2ffa24be9b1675155606f6ccf3d056da106a58d3;hp=e8515be07c35dc99904b40c429e3391d10f0155a Merge remote-tracking branch 'mariner/master' --- diff --git a/debian/changelog b/debian/changelog index 17463aa..1611b80 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +chiark-utils (5.0.3~) unstable; urgency=medium + + * git-cache-proxy: Do not spuriously timeout on too many simultaneous + invocations (specifically, do not timeout when reacquiring the lock + before serving). + + -- + chiark-utils (5.0.2) unstable; urgency=medium * Portability fix: Fix on libcs where st_mtime is not a macro diff --git a/debian/copyright b/debian/copyright index 37bb196..f629a23 100644 --- a/debian/copyright +++ b/debian/copyright @@ -37,6 +37,8 @@ xduplic-copier, a simple X client for typing into multiple windows git-cache-proxy, a rather shoddy daemon for speeding up git clone Copyright 2013 Ian Jackson + Copyright 2010 Tony Finch + Copyright 2017 Citrix summer, a tool for reporting complete details about a filesystem tree Copyright 2003-2007 Ian Jackson diff --git a/scripts/git-cache-proxy b/scripts/git-cache-proxy index 3e57a4f..647f6b6 100755 --- a/scripts/git-cache-proxy +++ b/scripts/git-cache-proxy @@ -30,6 +30,7 @@ # git-cache-proxy # Copyright 2010 Tony Finch # Copyright 2013,2014 Ian Jackson +# Copyright 2017 Citrix # # git-cache-proxy is free software; you can redistribute it and/or # modify them under the terms of the GNU General Public License as @@ -360,6 +361,7 @@ sub clonefetch () { servinfo "fetch/clone failed: $fetchfail"; } } + alarm 0; if (!$exists) { rename $tmpd, $gitd or fail "rename fresh $tmpd to $gitd: $!";