[Midnightbsd-cvs] mports: Magus.pm: The prior change to $Magus::Machine initilization was

[ctriv at midnightbsd.org]

Log Message:
-----------
The prior change to $Magus::Machine initilization was illadvised.

Modified Files:
--------------
    mports/Tools/lib:
        Magus.pm (r1.8 -> r1.9)

-------------- next part --------------
Index: Magus.pm
===================================================================
RCS file: /home/cvs/mports/Tools/lib/Magus.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -L Tools/lib/Magus.pm -L Tools/lib/Magus.pm -u -r1.8 -r1.9
--- Tools/lib/Magus.pm
+++ Tools/lib/Magus.pm
@@ -1,4 +1,4 @@
-package Magus;
+package Magusc;
 
 use strict;
 use warnings;
@@ -25,13 +25,9 @@
 our $Machine;
 
 BEGIN {
-  if (Magus::DBI->ping) {
-    $Machine = Magus::Machine->retrieve(
-      name => $Magus::Config{'Machine'}
-    ) || die "Invalid machine: $Magus::Config{Machine}\n";
-  } else {
-    warn "Warning: Unable to connect to database.  \$Magus::Machine unset.\n";
-  }
+  $Machine = Magus::Machine->retrieve(
+    name => $Magus::Config{'Machine'}
+  ) || die "Invalid machine: $Magus::Config{Machine}\n";
 }