[Pkg-dkms-commits] [dkms] 01/01: Fixed "sed without options" issue.

[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 9064776a8a9b5fb633e14a225c162a87eeea2cfd
Author: Giuseppe Iuculano <iuculano at debian.org>
Date:   Sat Oct 4 19:28:19 2014 +0200

    Fixed "sed without options" issue.
    
    Closes: #757758
    Thanks: Cristian Ionescu-Idbohrn
---
 debian/patches/757758.patch | 25 +++++++++++++++++++++++++
 debian/patches/series       |  1 +
 2 files changed, 26 insertions(+)

diff --git a/debian/patches/757758.patch b/debian/patches/757758.patch
new file mode 100644
index 0000000..b555b3b
--- /dev/null
+++ b/debian/patches/757758.patch
@@ -0,0 +1,25 @@
+--- a/dkms
++++ b/dkms
+@@ -761,16 +766,17 @@
+     # do all the changes at once, record the diffs for posterity
+     for file in "$@"; do
+ 	[[ $file && -w $file ]] || continue
++	_tmpf="$temp_dir_name/${file##*/}.new"
+ 	if [[ $file = /etc/sysconfig/kernel ]]; then
+-	    sed "${sa_sck_o[@]}" "$file" > "$temp_dir_name/${file##*/}.new"
++	    [ -z "${sa_sck_o[@]}" ] || sed "${sa_sck_o[@]}" "$file" > "$_tmpf"
+ 	else
+-	    sed "${sa_mc_o[@]}" "$file" > "$temp_dir_name/${file##*/}.new"
++	    [ -z "${sa_mc_o[@]}" ] || sed "${sa_mc_o[@]}" "$file" > "$_tmpf"
+ 	fi
+-	if ! mod_diff=$(diff -u "$temp_dir_name/${file##*/}.new" "$file"); then
++	if [ -f "$_tmpf" ] && ! mod_diff=$(diff -u "$_tmpf" "$file"); then
+ 	    echo $"$file updated to replace obsoleted module references:"
+ 	    echo "$mod_diff"
+-	    cp -fp "$temp_dir_name/${file##*/}.new" "$file"
+-	    rm -f "$temp_dir_name/${file##*/}.new"
++	    cp -fp "$_tmpf" "$file"
++	    rm -f "$_tmpf"
+ 	fi
+     done
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 6f89030..7d5ed41 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 666023.patch
 657145.patch
 688904.patch
+757758.patch

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