This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch quake
in repository game-data-packager.
commit 4c141b6ca301ea358bd8682cb1a4cb57ba3062f0
Author: Simon McVittie <s...@debian.org>
Date: Thu Sep 26 21:49:04 2013 +0100
Don't use usermod -e if not using shadow passwords
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=679642
Reviewed-by: Roger Leigh
---
debian/changelog | 5 +++++
debian/quake-server.postinst | 6 +++++-
debian/quake-server.postrm | 6 +++++-
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b116ac9..937dfe0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
quake (3) UNRELEASED; urgency=low
+ [ David Banks ]
* Add LSB description field to init script.
* Add status action to init script (ported from quake3 package).
* Bump debhelper compat version to 9 to avoid python warning.
* Bump standards version to the latest version, 3.9.3.
+ [ Simon McVittie ]
+ * Apply patch from Stephan Springl to install successfully with
+ non-shadow passwords (Closes: #679642)
+
-- David Banks <amoe...@gmail.com> Thu, 18 Oct 2012 12:23:51 +0100
quake (2) unstable; urgency=low
diff --git a/debian/quake-server.postinst b/debian/quake-server.postinst
index e0319b3..c241c8b 100644
--- a/debian/quake-server.postinst
+++ b/debian/quake-server.postinst
@@ -11,7 +11,11 @@ case "$1" in
--ingroup games --force-badname quake-server
fi
# Unlock account, if it was locked by our postrm
- usermod -U -e '' quake-server
+ if [ -f /etc/shadow ]; then
+ usermod -U -e '' quake-server
+ else
+ usermod -U quake-server
+ fi
install -d /var/games
install -d -o quake-server -g games /var/games/quake-server
;;
diff --git a/debian/quake-server.postrm b/debian/quake-server.postrm
index 3f84523..3fab61b 100644
--- a/debian/quake-server.postrm
+++ b/debian/quake-server.postrm
@@ -6,7 +6,11 @@ set -e
if [ "$1" = "purge" ] ; then
# Lock account on purge
- usermod -L -e 1 quake-server
+ if [ -f /etc/shadow ]; then
+ usermod -L -e 1 quake-server
+ else
+ usermod -L quake-server
+ fi
rm -r /var/games/quake-server
rmdir --ignore-fail-on-non-empty /var/games
fi
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/game-data-packager.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
