Commit 9d4ec01a authored by Robert Ricci's avatar Robert Ricci

Revert "Add sitevars marked with the new include_ns column to the NS"

It was not ready to be committed to the emulab-devel repo yet. Oops!

This reverts commit 5771f06b.
parent 456220c2
......@@ -566,28 +566,6 @@ sub GenDefsFile($)
print TCL "\n";
print TCL "# Site variables\n";
$query_result = DBQueryFatal("select name,value,defaultvalue " .
" from sitevariables where ns_include=TRUE");
while (my ($name,$value,$defaultvalue) = $query_result->fetchrow_array()) {
# Use the default value if unset, or skip altogether if the default
# is just the empty string.
if (!defined($value)) {
if ($defaultvalue eq "") {
} else {
$value = $defaultvalue;
# Escape special characters in the value (just braces)
$value =~ s/([{}])/\\$1/g;
# Note: braces in tcl act like single quotes in other scripting
# languages (eg. no interpolation occurs)
print TCL "set sitevariables($name) {$value}\n";
print TCL "\n";
if (defined($pid)) {
print TCL "# OSIDs\n";
$query_result =
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment