[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@nicira.com>
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 scripts/vif |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/scripts/vif b/scripts/vif
index 77d39400476e6de0c419dcbcacebef23c1833ce9..3a209f9b4ae315d732483d0d6fb8f9f4eb1323d5 100755 (executable)
--- a/scripts/vif
+++ b/scripts/vif
@@ -172,7 +172,10 @@ remove_from_bridge()
            # 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
 }