[linux] 01/01: linux-image: postrm: Make failure of rmdir on purge non-fatal (Closes: #836282)

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch sid
in repository linux.

commit 550ac5c6dc9979ab1fef22c0e730358f00ccc841
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Fri Sep 16 23:49:36 2016 +0100

    linux-image: postrm: Make failure of rmdir on purge non-fatal (Closes: #836282)
---
 debian/changelog                 | 2 ++
 debian/templates/image.postrm.in | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9c73eb6..76ebcfd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -184,6 +184,8 @@ linux (4.7.4-1) UNRELEASED; urgency=medium
   * [armhf] Enable drivers for Novena: MFD_STMPE as built-in; DRM_PANEL_SIMPLE,
     MMA8452, TOUCHSCREEN_STMPE, BATTERY_SBS, BACKLIGHT_PWM, SND_SOC_IMX_ES8328
     as modules (Closes: #837627, thanks to Vagrant Cascadian)
+  * linux-image: postrm: Make failure of rmdir on purge non-fatal
+    (Closes: #836282)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 03 Sep 2016 18:34:31 +0100
 
diff --git a/debian/templates/image.postrm.in b/debian/templates/image.postrm.in
index 29e9c82..4298752 100755
--- a/debian/templates/image.postrm.in
+++ b/debian/templates/image.postrm.in
@@ -25,7 +25,7 @@ if [ "$1" = purge ]; then
 		      modules.softdep modules.devname; do
 	eval rm -f /lib/modules/$version/$extra_file
     done
-    rmdir /lib/modules/$version
+    rmdir /lib/modules/$version || true
 fi
 
 exit 0

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