[Pkg-dkms-commits] [SCM] Dynamic Kernel Module Support branch, master, updated. debian/2.1.1.1-2-9-gc5566c7

Giuseppe Iuculano iuculano at debian.org
Mon Feb 22 14:23:21 UTC 2010


The following commit has been merged in the master branch:
commit 4fff92834bc949420d2d1caded6ecbb165f4927a
Author: Giuseppe Iuculano <iuculano at debian.org>
Date:   Mon Feb 22 15:20:55 2010 +0100

    Removed 01_shell_error.patch, merged in upstream

diff --git a/debian/patches/01_shell_error.patch b/debian/patches/01_shell_error.patch
deleted file mode 100644
index 8b68e58..0000000
--- a/debian/patches/01_shell_error.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Correct a minor shell error in dkms_autoinstaller
---- a/dkms_autoinstaller
-+++ b/dkms_autoinstaller
-@@ -138,8 +138,7 @@ case "$1" in
-             else
-                 invoke_command "dkms install -m $module_in_tree -v $version_in_tree -k $kernel -a $arch -q" "." background
-                 return_status=$?
--                if [ "$return_status" -eq 0 ]; then
--                elif [ "$return_status" -eq 101 ]; then
-+                if [ "$return_status" -eq 101 ]; then
-                     logger -t dkms_autoinstaller "  A newer module version than this already exists in kernel."
-                     logger -t dkms_autoinstaller "  Skipping install... (you can manually install later with --force)"
-                 elif [ "$return_status" -ne 0 ]; then
diff --git a/debian/patches/series b/debian/patches/series
index a004dbe..9abd828 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-01_shell_error.patch
 02_header_postinst.patch

-- 
Dynamic Kernel Module Support



More information about the Pkg-dkms-commits mailing list