Merge lp:~vanvugt/ubuntu/oneiric/bcmwl/fix-776439 into lp:ubuntu/oneiric/bcmwl

[Daniel van Vugt]

Failing to remove a DKMS module that does not exist is not an error (LP: #776439)

The prerm script for bcmwl-kernel-source was often failing to remove a DKMS module that did not exist. Failing to remove something that does not exist should not mean the overall remove operation should fail.

This patch ensures that if the DKMS module does not exist, then prerm doesn't fail trying to remove it (LP: #776439)

It is true that the root cause of this bug is failure to install the DKMS module in the first place. However that failure would always be visible as a failure during installation, and should be treated as a separate bug/s.

[Daniel van Vugt (vanvugt)]

This fix also needs to be back-ported to natty.

[Michael Terry (mterry)]

I think it would be safer to just add || true to the end of the line, no? That way, no matter what error it gives, we'll be able to continue. And we don't have to worry about counting the modules. I'll make that change and merge.

[Daniel van Vugt (vanvugt)]

Michael, your suggestion is incorrect. I thought of it already.

The problem with adding || true to the end of the line is that you then prevent any other future errors from "dkms remove" from being emitted.

[Daniel van Vugt (vanvugt)]

A possibly more elegant solution would be:

if [ $count -gt 0 ]; then
  dkms remove -m bcmwl -v $CVERSION --all > /dev/null
fi

=== modified file 'debian/bcmwl-kernel-source.prerm'
--- debian/bcmwl-kernel-source.prerm	2010-11-25 15:06:14 +0000
+++ debian/bcmwl-kernel-source.prerm	2011-05-30 07:13:08 +0000
@@ -10,8 +10,10 @@
 CVERSION=`dpkg-query -W -f='${Version}' bcmwl-kernel-source | awk -F "-" '{print $1}' | cut -d\: -f2`
 case "$1" in
     remove|upgrade)
-		echo "Removing all DKMS Modules"
-		dkms remove -m bcmwl -v $CVERSION --all > /dev/null
+		count=`dkms status -m bcmwl -v $CVERSION | wc -l`
+		echo "Removing all DKMS Modules ($count)"
+		[ $count -le 0 ] && true ||
+			dkms remove -m bcmwl -v $CVERSION --all > /dev/null
 		echo "Done."
         ;;
 esac