[Piuparts-commits] [piuparts] 02/04: Revert "Revert "fix the nsswitch.conf upgrade workarounds""

[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 899aefe0b353f664e55fdad4548a0cf16b7f8ebe
Author: Andreas Beckmann <anbe at debian.org>
Date:   Tue Oct 6 16:45:41 2015 +0200

    Revert "Revert "fix the nsswitch.conf upgrade workarounds""
    
    This reverts commit 0f5f6ace5edfab9daa96c0f25b57453d45f1f949.
---
 custom-scripts/scripts/post_distupgrade_exceptions | 6 +++---
 debian/changelog                                   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/custom-scripts/scripts/post_distupgrade_exceptions b/custom-scripts/scripts/post_distupgrade_exceptions
index cfebbcb..cfc1ab7 100755
--- a/custom-scripts/scripts/post_distupgrade_exceptions
+++ b/custom-scripts/scripts/post_distupgrade_exceptions
@@ -50,9 +50,9 @@ fi
 if [ "$PIUPARTS_DISTRIBUTION" = "jessie" ]; then
 
 	# base-files only upgrades pristine /etc/nsswitch.conf
-	if grep -q ^gshadow: /etc/nsswitch.conf ; then
-		echo "Removing gshadow line from /etc/nsswitch.conf"
-		sed -i /^gshadow:/d /etc/nsswitch.conf
+	if ! grep -q ^gshadow: /etc/nsswitch.conf ; then
+		echo "Adding gshadow line to /etc/nsswitch.conf"
+		sed -i '/^shadow:/a gshadow:        files' /etc/nsswitch.conf
 	fi
 
 fi
diff --git a/debian/changelog b/debian/changelog
index af72bf1..8ccc5d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ piuparts (0.67) UNRELEASED; urgency=medium
   [ Andreas Beckmann ]
   * piuparts.py:
     - Ensure /etc/mtab exists in the chroot.
+  * scripts/post_distupgrade_exceptions:
+    - Fix the /etc/nsswitch.conf wheezy -> jessie upgrade handling.
 
  -- Holger Levsen <holger at debian.org>  Wed, 26 Aug 2015 01:00:23 +0200
 
@@ -39,8 +41,6 @@ piuparts (0.65) unstable; urgency=medium
   * piuparts-master-backend.py:
     - Catch URLError, log it and abort without backtrace.
   * piuparts-common: Add Depends: python-lzma.
-  * scripts/post_distupgrade_exceptions:
-    - Fix the /etc/nsswitch.conf wheezy -> jessie upgrade handling.
   * scripts/pre_remove_40_find_unowned_lib_links: Ignore some symlinks caused
     by mpi-default-dev and libglide2/libglide3.
   * Add/adjust some exceptions for ancient packages.

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