Commit 7bd329e6 authored by Mike Hibler's avatar Mike Hibler
Browse files

Fix check to ignore LOCK/UNLOCK/DELETE lines generated in the distribution

version of database-fill.sql
parent e6a1e3e8
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group. # Copyright (c) 2000-2004 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
use strict; use strict;
...@@ -41,7 +41,7 @@ if (system("perl $export_tables | sort > $tempoldfile")) { ...@@ -41,7 +41,7 @@ if (system("perl $export_tables | sort > $tempoldfile")) {
die("*** $0:\n". die("*** $0:\n".
" $export_tables failed!\n"); " $export_tables failed!\n");
} }
if (system("sort $master_fill > $tempnewfile")) { if (system("grep -E -v '^(LOCK|UNLOCK|DELETE) ' $master_fill | sort > $tempnewfile")) {
unlink($tempoldfile); unlink($tempoldfile);
die("*** $0:\n". die("*** $0:\n".
" sort $master_fill failed!\n"); " sort $master_fill failed!\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