[Pkg-dkms-commits] [dkms] 01/01: fixes have_one_kernel for non-zero return code.

[Giuseppe Iuculano]

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

iuculano pushed a commit to branch master
in repository dkms.

commit 1fa1a310755e79688d7eca4df03541957f7abf92
Author: Giuseppe Iuculano <iuculano at debian.org>
Date:   Sat Oct 4 19:38:21 2014 +0200

    fixes have_one_kernel for non-zero return code.
    
    Closes: #659672
    Closes: #735181
    Thanks: Mario Limonciello
---
 ...x_have_one_kernel_for_non-zero_return_code.diff | 27 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 28 insertions(+)

diff --git a/debian/patches/fix_have_one_kernel_for_non-zero_return_code.diff b/debian/patches/fix_have_one_kernel_for_non-zero_return_code.diff
new file mode 100644
index 0000000..b95a199
--- /dev/null
+++ b/debian/patches/fix_have_one_kernel_for_non-zero_return_code.diff
@@ -0,0 +1,27 @@
+Description: Fixes function have_one_kernel in dkms script for non-zero return code
+Author: Mario Limonciello <Mario_Limonciello at Dell.com>
+Origin: upstream
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1261116
+
+--- a/dkms
++++ b/dkms
+@@ -163,11 +163,14 @@
+ 
+ # A little test function for DKMS commands that only work on one kernel.
+ have_one_kernel() {
+-    (( ${#kernelver[@]} > 1 )) && \
+-	die 4 $"The action $1 does not support multiple kernel version" \
+-	$"parameters on the command line."
+-    [[ $all ]] && die 5 $"The action $1 does not support the --all" \
+-	$"parameter."
++    if (( ${#kernelver[@]} != 1 )); then
++        die 4 $"The action $1 does not support multiple kernel version" \
++        $"parameters on the command line."
++    fi
++    if [[ $all ]]; then
++        die 5 $"The action $1 does not support the --all" \
++        $"parameter."
++    fi
+ }
+ 
+ # Set up the kernelver and arch arrays.  You must have a 1:1 correspondence --
diff --git a/debian/patches/series b/debian/patches/series
index 7d5ed41..ed5562a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 657145.patch
 688904.patch
 757758.patch
+fix_have_one_kernel_for_non-zero_return_code.diff

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