Bug#623529: pu: package git/1:1.7.2.5-2

[Jonathan Nieder <jrnieder@gmail.com>]

Package: release.debian.org
User: release.debian.org@packages.debian.org
Usertags: pu
Tags: squeeze

Hi,

Jonathan Nieder wrote:

> git-daemon-run wants to be removed and purged in steps separated by a sleep
> of a second or so.  Otherwise userdel fails with "user gitlog is currently
> logged in".

I would be interested in fixing this in squeeze.  The fix has only
been in sid for four days but I've been using it locally for a month
or so (and purging git-daemon-run now and then) without problems.

A more complete discussion can be found in the commit log at

  git://repo.or.cz/git/debian/jrn.git debian-stable

and the bug log for Bug#607243 ("git-daemon-run: cannot purge and
remove in one step").

What do you think?
---
 debian/changelog             |    7 +++++++
 debian/git-daemon-run.postrm |    2 +-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2e55b70..389bf58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+git (1:1.7.2.5-2) stable; urgency=low
+
+  * debian/git-daemon-run.postrm purge: terminate the git-daemon/log
+    service before removing the gitlog user (closes: #610099).
+
+ -- Jonathan Nieder <jrnieder@gmail.com>  Wed, 20 Apr 2011 17:17:27 -0500
+
 git (1:1.7.2.5-1) stable; urgency=low
 
   * new upstream point release.
diff --git a/debian/git-daemon-run.postrm b/debian/git-daemon-run.postrm
index 6151b52..5e77e4d 100644
--- a/debian/git-daemon-run.postrm
+++ b/debian/git-daemon-run.postrm
@@ -3,7 +3,7 @@ set -e
 
 test "$1" = 'purge' || exit 0
 
-sv force-stop git-daemon 2>/dev/null || :
+sv force-shutdown /etc/sv/git-daemon 2>/dev/null || :
 rm -rf /etc/sv/git-daemon/supervise /etc/sv/git-daemon/log/supervise
 rm -rf /var/lib/supervise/git-daemon /var/lib/supervise/git-daemon.log
 
-- 
1.7.5.rc2