Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=079dfaa6adf1bfcbf577e7b9436f45c875405466
commit 079dfaa6adf1bfcbf577e7b9436f45c875405466
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Wed Jan 27 13:42:44 2010 +0100
util.sh::Fpatch: show patching output only once
- we used to show it twice when it succeeded and -p1 was used
diff --git a/source/include/util.sh b/source/include/util.sh
index 8215fe7..0c7d911 100644
--- a/source/include/util.sh
+++ b/source/include/util.sh
@@ -580,7 +580,13 @@ __Fpatch() {
fi
level="1"
fi
- patch -Np$level --no-backup-if-mismatch -i "$Fsrcdir/$1" || Fdie
+ # if we are here, the patch applied with -p1, so it's no good
+ # showing the output again
+ if [ "$level" = 1 ]; then
+ patch -Np$level --no-backup-if-mismatch -i "$Fsrcdir/$1"
>/dev/null || Fdie
+ else
+ patch -Np$level --no-backup-if-mismatch -i "$Fsrcdir/$1" || Fdie
+ fi
return 0
}
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
