[Piuparts-commits] [piuparts] 04/06: extend adduser.conf exception to cover dpsyco-lib modifications

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit 36a97f977f3e30bd063fd2407564609ccf5d9cb4
Author: Andreas Beckmann <anbe at debian.org>
Date:   Fri Jan 23 15:00:09 2015 +0100

    extend adduser.conf exception to cover dpsyco-lib modifications
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
 custom-scripts/scripts/pre_distupgrade_exceptions | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/custom-scripts/scripts/pre_distupgrade_exceptions b/custom-scripts/scripts/pre_distupgrade_exceptions
index f4bbcc8..14e13b5 100755
--- a/custom-scripts/scripts/pre_distupgrade_exceptions
+++ b/custom-scripts/scripts/pre_distupgrade_exceptions
@@ -17,7 +17,11 @@ if [ "$PIUPARTS_DISTRIBUTION_NEXT" = "squeeze" ]; then
 
 	# squeeze does not properly upgrade adduser.conf, so generate a new one
 	if [ -f /etc/adduser.conf ]; then
-		if [ "$(md5sum /etc/adduser.conf | awk '{ print $1 }')" = "5b577c9cb18e4852fc7e45830d230ec1" ];
+		md5="$(md5sum /etc/adduser.conf | awk '{ print $1 }')"
+		# 5b577c9cb18e4852fc7e45830d230ec1: adduser/lenny pristine
+		# 28928669e36f1ab616dfda39af3d79a7: adduser/lenny + dpsyco-lib/lenny
+		if	[ "$md5" = "5b577c9cb18e4852fc7e45830d230ec1" ] || \
+			[ "$md5" = "28928669e36f1ab616dfda39af3d79a7" ]
 		then
 			rm -fv /etc/adduser.conf
 		fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git