# HG changeset patch
# User Ben Pfaff <blp@xxxxxxxxxx>
# Date 1278595885 -3600
# Node ID aaeba1119fafdb49f821244d51f08f36c2178a93
# Parent  f0f9bfec4fe259e0f073a4bcd8bf091c2c6dc2f9
[PATCH] xenserver: Suppress error message for expected non-error condition.

>From d5bac2a0cfea7efc27c4f06de132460390a2e920 Mon Sep 17 00:00:00 2001
Date: Tue, 2 Mar 2010 13:52:33 -0800
Signed-off-by: Ben Pfaff <blp@xxxxxxxxxx>
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 scripts/vif |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff -r f0f9bfec4fe2 -r aaeba1119faf scripts/vif
--- a/scripts/vif	Thu Jul 08 14:31:24 2010 +0100
+++ b/scripts/vif	Thu Jul 08 14:31:25 2010 +0100
@@ -172,7 +172,10 @@
 	    # Nothing to do
 	    ;;
 	vswitch)
-	    $vsctl del-port $dev
+            # If ovs-brcompatd is running, it might already have deleted the
+            # port.  Use --if-exists to suppress the error that would otherwise
+            # arise in that case.
+	    $vsctl -- --if-exists del-port $dev
 	    ;;
     esac
 }