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

debian-kernel at lists.debian.org debian-kernel at lists.debian.org
Thu Oct 20 21:55:23 UTC 2016


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

benh pushed a commit to branch sid
in repository linux-signed.

commit ff8f2859f1a032b7ea29cce9b23e490e73a8ce21
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Oct 20 22:53:50 2016 +0100

    linux-image: postrm: Make failure of rmdir on purge non-fatal (Closes: #841453)
    
    Same as bug #836282 in src:linux... I forgot to apply the same change here.
---
 debian/changelog                 | 7 +++++++
 debian/templates/image.postrm.in | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e5e3212..88f1a74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linux-signed (2.8) UNRELEASED; urgency=medium
+
+  * linux-image: postrm: Make failure of rmdir on purge non-fatal
+    (Closes: #841453)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Thu, 20 Oct 2016 22:53:10 +0100
+
 linux-signed (2.7) unstable; urgency=medium
 
   * Reduce kernel-wedge minimum version to 2.93~
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-signed.git



More information about the Kernel-svn-changes mailing list