Commit 23698ba6 authored by Leigh B. Stoller's avatar Leigh B. Stoller
Browse files

Okay, -f option to pkg_delete does not operate as I thought it would.

parent 50573f26
...@@ -732,7 +732,8 @@ sub SetupOpsNode($) ...@@ -732,7 +732,8 @@ sub SetupOpsNode($)
SetupFatal("Could not get package info from Emulab!"); SetupFatal("Could not get package info from Emulab!");
} }
print "Removing conflicting packages.\n"; print "Removing conflicting packages.\n";
mysystem("pkg_delete -f -r -x mysql-client"); mysystem("pkg_delete -r -x mysql-client")
if (-e "/usr/local/bin/mysql");
print "Installing the ops metaport.\n"; print "Installing the ops metaport.\n";
...@@ -1085,7 +1086,8 @@ sub SetupBossNode() ...@@ -1085,7 +1086,8 @@ sub SetupBossNode()
SetupFatal("Could not get package info from Emulab!"); SetupFatal("Could not get package info from Emulab!");
} }
print "Removing conflicting packages.\n"; print "Removing conflicting packages.\n";
mysystem("pkg_delete -f -r -x mysql-client"); mysystem("pkg_delete -r -x mysql-client")
if (-e "/usr/local/bin/mysql");
print "Installing the boss metaport.\n"; print "Installing the boss metaport.\n";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment