Changeset 593 for branches/stable/cgi-bin/allocate.pl

Timestamp:

05/14/13 18:10:22 (11 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge /trunk r517 (merge /branches/htmlform)
Conflicts all resolved towards /trunk.
Fix a minor syntax error with "while (@data..." -> "while (my @data..."
(may cause merge conflicts later)

Location:

branches/stable

Files:

• . (modified) (1 prop)
• cgi-bin/allocate.pl (modified) (2 diffs)

branches/stable/cgi-bin/allocate.pl

@@ -11 +11 @@
 use warnings;
 use DBI;
-use CommonWeb qw(:ALL);
 use NetAddr::IP;
 
@@ -38 +37 @@
 my $errstr;
 ($ip_dbh,$errstr) = connectDB_My;
-if (!$ip_dbh) {
-  printAndExit("Failed to connect to database: $errstr\n");
-}
+die "Failed to connect to database: $errstr\n"
+        if !$ip_dbh;
+
 checkDBSanity($ip_dbh);
 initIPDBGlobals($ip_dbh);