[Frugalware-darcs] frugalware-current: include/util.sh: Fpatch(): handle the case when a patch can be applied with p1 and p0, too

VMiklos vmiklos at frugalware.org
Tue Oct 31 00:41:40 CET 2006


Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061030233433-e2957-8ff0d3a3bec7b428d3285622038c12181f638619.gz;

[include/util.sh: Fpatch(): handle the case when a patch can be applied with p1 and p0, too
VMiklos <vmiklos at frugalware.org>**20061030233433] {
hunk ./source/include/util.sh 359
-	patch -Np0 --dry-run -i "$Fsrcdir/$i" >/dev/null && level="0"
+	if patch -Np0 --dry-run -i "$Fsrcdir/$i" >/dev/null && \
+		! patch -Np1 --dry-run -i "$Fsrcdir/$i" >/dev/null; then
+		level="0"
+	fi
}


More information about the Frugalware-darcs mailing list