[Ovirt-devel] [PATCH node] Adds vlan support to auto-installations for the node. bz#511056

[Joey Boggs]

On 07/14/2009 04:08 PM, Darryl L. Pierce wrote:
> On Tue, Jul 14, 2009 at 03:09:00PM -0400, Joey Boggs wrote:
>    
>> Tried this on 2 different boxes getting whitespace errors, but the patch
>> file doesn't show any extra spaces?
>>      
>
> Are you trying to apply them upstream or to EL-5? These are upstream
> patches.
>
>    

Yeah tried directly against upstream next branch:


[jboggs at localhost ovirt-node]$ git branch
   master
* next

[jboggs at localhost ovirt-node]$ git am ~/mbox-patch/\[Ovirt-devel\]\ 
\[PATCH\ node\]\ Adds\ vlan\ support\ to\ auto-installations\       for\ 
the\ node.\ bz#511056.eml
Applying: Adds vlan support to auto-installations for the node. bz#511056
/home/jboggs/Desktop/upstream/ovirt-node/.git/rebase-apply/patch:14: 
trailing whitespace.
# Configures vlan for the node.
/home/jboggs/Desktop/upstream/ovirt-node/.git/rebase-apply/patch:15: 
trailing whitespace.
# $1 - the nic
/home/jboggs/Desktop/upstream/ovirt-node/.git/rebase-apply/patch:16: 
trailing whitespace.
# $2 - the network bridge name
/home/jboggs/Desktop/upstream/ovirt-node/.git/rebase-apply/patch:17: 
trailing whitespace.
# $3 - the vlan id
/home/jboggs/Desktop/upstream/ovirt-node/.git/rebase-apply/patch:18: 
trailing whitespace.
# $4 - the VL_ROOT variable
error: patch failed: scripts/ovirt-config-networking:45
error: scripts/ovirt-config-networking: patch does not apply
error: patch failed: scripts/ovirt-early:208
error: scripts/ovirt-early: patch does not apply
Patch failed at 0001 Adds vlan support to auto-installations for the 
node. bz#511056
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
[jboggs at localhost ovirt-node]$

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20090714/52d6f472/attachment.htm>