[gentoo-commits] repo/gentoo:master commit in: sys-block/di/files/

[gentoo-commits] repo/gentoo:master commit in: sys-block/di/files/

[Lars Wendler]

commit:     d563a29adc06b1ce9ca658b526d57e7024c2730e
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 11 10:07:48 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Apr 11 10:07:48 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d563a29a

sys-block/di: Minor patch correction.

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 sys-block/di/files/di-4.45-no_echo-n.patch | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/sys-block/di/files/di-4.45-no_echo-n.patch b/sys-block/di/files/di-4.45-no_echo-n.patch
index c0c1b1e0f2a..a15901a257b 100644
--- a/sys-block/di/files/di-4.45-no_echo-n.patch
+++ b/sys-block/di/files/di-4.45-no_echo-n.patch
@@ -62,7 +62,15 @@ https://www.in-ulm.de/%7Emascheck/various/echo+printf/
  }
 --- di-4.45/mkconfig/mkconfig.sh
 +++ di-4.45/mkconfig/mkconfig.sh
-@@ -154,7 +154,7 @@
+@@ -28,7 +28,6 @@
+ . ${_MKCONFIG_DIR}/bin/shellfuncs.sh
+ 
+ doshelltest $0 $@
+-setechovars
+ 
+ LOG="mkconfig.log"
+ _MKCONFIG_TMP="_tmp_mkconfig"
+@@ -154,7 +153,7 @@
    tlabel=$2
  
    echo "   $ifleveldisp[${tname}] ${tlabel} ... " >&9
@@ -71,6 +79,16 @@ https://www.in-ulm.de/%7Emascheck/various/echo+printf/
  }
  
  _doexport () {
+--- di-4.45/mkconfig/mkc.sh
++++ di-4.45/mkconfig/mkc.sh
+@@ -16,7 +16,6 @@
+ . ${_MKCONFIG_DIR}/bin/shellfuncs.sh
+ 
+ doshelltest $0 $@
+-setechovars
+ 
+ rc=0
+ args=$@
 --- di-4.45/mkconfig/units/c-main.sh
 +++ di-4.45/mkconfig/units/c-main.sh
 @@ -559,7 +559,7 @@