<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
</head>
<body bgcolor="#ffffff" text="#000000">
On 07/14/2009 04:08 PM, Darryl L. Pierce wrote:
<blockquote
cite="mid:20090714200800.GI3432@mcpierce-laptop.rdu.redhat.com"
type="cite">
<pre wrap="">On Tue, Jul 14, 2009 at 03:09:00PM -0400, Joey Boggs wrote:
</pre>
<blockquote type="cite">
<pre wrap="">Tried this on 2 different boxes getting whitespace errors, but the patch
file doesn't show any extra spaces?
</pre>
</blockquote>
<pre wrap=""><!---->
Are you trying to apply them upstream or to EL-5? These are upstream
patches.
</pre>
</blockquote>
<br>
Yeah tried directly against upstream next branch:<br>
<br>
<br>
[jboggs@localhost ovirt-node]$ git branch<br>
master<br>
* next<br>
<br>
[jboggs@localhost ovirt-node]$ git am ~/mbox-patch/\[Ovirt-devel\]\
\[PATCH\ node\]\ Adds\ vlan\ support\ to\ auto-installations\
for\ the\ node.\ bz#511056.eml <br>
Applying: Adds vlan support to auto-installations for the node.
bz#511056<br>
/home/jboggs/Desktop/upstream/ovirt-node/.git/rebase-apply/patch:14:
trailing whitespace.<br>
# Configures vlan for the node.<br>
/home/jboggs/Desktop/upstream/ovirt-node/.git/rebase-apply/patch:15:
trailing whitespace.<br>
# $1 - the nic<br>
/home/jboggs/Desktop/upstream/ovirt-node/.git/rebase-apply/patch:16:
trailing whitespace.<br>
# $2 - the network bridge name<br>
/home/jboggs/Desktop/upstream/ovirt-node/.git/rebase-apply/patch:17:
trailing whitespace.<br>
# $3 - the vlan id<br>
/home/jboggs/Desktop/upstream/ovirt-node/.git/rebase-apply/patch:18:
trailing whitespace.<br>
# $4 - the VL_ROOT variable<br>
error: patch failed: scripts/ovirt-config-networking:45<br>
error: scripts/ovirt-config-networking: patch does not apply<br>
error: patch failed: scripts/ovirt-early:208<br>
error: scripts/ovirt-early: patch does not apply<br>
Patch failed at 0001 Adds vlan support to auto-installations for the
node. bz#511056<br>
When you have resolved this problem run "git am --resolved".<br>
If you would prefer to skip this patch, instead run "git am --skip".<br>
To restore the original branch and stop patching run "git am --abort".<br>
[jboggs@localhost ovirt-node]$ <br>
<br>
</body>
</html>