Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ca1f518263abaa1c790c7d46477163e5e9ebdca6

commit ca1f518263abaa1c790c7d46477163e5e9ebdca6
Author: Michel Hermier <herm...@frugalware.org>
Date:   Fri Dec 11 16:07:12 2009 +0100

util.sh

* Do a sed dos2unix conversion in Fpatch (do we have binary patch
out there that require this conversion to be skipped?)

diff --git a/source/include/util.sh b/source/include/util.sh
index bc2d18b..46fee10 100644
--- a/source/include/util.sh
+++ b/source/include/util.sh
@@ -487,6 +487,7 @@ Fpatch() {
else
i=$1
fi
+       sed 's/\r$//' "$Fsrcdir/$i" > "$Fsrcdir/$i"
if patch -Np0 --dry-run -i "$Fsrcdir/$i" >/dev/null && \
! patch -Np1 --dry-run -i "$Fsrcdir/$i" >/dev/null; then
level="0"
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to