Merge lp:~javier-lopez/ubuntu/maverick/dkms/fix-613407 into lp:ubuntu/maverick/dkms

[Javier López]

dkms_autoinstaller: Tests existence of the configuration file before sourcing it

[Daniel Holbach (dholbach)]

Can we try to merge/sync from Debian instead?

review: Needs Information

[Javier López (javier-lopez)]

I've just downloaded the debian .dsc file and it's fixed there so definitely to merge/sync is the best thing to do, unfortunately my kung-fu isn't that good (yet), so anyone else will have to do it.

[Benjamin Drung (bdrung)]

I have merged 2.1.1.2-5, which contains your fix.

review: Approve

Unmerged revisions

39. By Javier López on 2010-08-13

dkms_autoinstaller:Tests existence of the configuration file before
sourcing it (LP: #613407)

=== modified file 'debian/changelog'
--- debian/changelog	2010-06-15 00:53:13 +0000
+++ debian/changelog	2010-08-13 20:51:45 +0000
@@ -1,3 +1,11 @@
+dkms (2.1.1.2-3fakesync1ubuntu1) maverick; urgency=low
+
+   [pasadrul]
+  * dkms_autoinstaller:Tests existence of the configuration file before
+    sourcing it (LP: #613407)
+
+ -- chilicuil <[e-mail]>  Fri, 13 Aug 2010 15:06:36 -0500
+
 dkms (2.1.1.2-3fakesync1) maverick; urgency=low
 
   * Fake sync due to mismatching orig tarball (LP: #594363).
 
=== modified file 'dkms_autoinstaller'
--- dkms_autoinstaller	2010-06-15 00:53:13 +0000
+++ dkms_autoinstaller	2010-08-13 20:51:45 +0000
@@ -53,7 +53,7 @@
 arch=${uname#* }
 kernel_preparation_done=""
 dkms_tree="/var/lib/dkms"
-. /etc/dkms/framework.conf 2>/dev/null
+[ -e /etc/dkms/framework.conf ] && . /etc/dkms/framework.conf 2>/dev/null
 
 # See how we were called.
 case "$1" in