[padb-devel] [padb] r135 committed - Don't use "auto" for resource manager, use undef as we do for other...

[codesite-noreply at google.com]

Revision: 135
Author: apittman
Date: Sun Aug 23 03:11:41 2009
Log: Don't use "auto" for resource manager, use undef as we do for other
config options.

http://code.google.com/p/padb/source/detail?r=135

Modified:
  /trunk/src/padb

=======================================
--- /trunk/src/padb	Sun Aug 23 03:00:38 2009
+++ /trunk/src/padb	Sun Aug 23 03:11:41 2009
@@ -404,7 +404,7 @@
  # Tuning options.
  $conf{prun_timeout}     = 120;
  $conf{prun_exittimeout} = 120;
-$conf{rmgr}             = "auto";
+$conf{rmgr}             = undef;

  $conf{slurm_job_step} = 0;

@@ -2652,7 +2652,12 @@
  # If it's been set on the command line and it's valid then just use what  
we are given.
  # Do sanity checks here but only warn on the result to cope with  
non-default installs.

-    if ( defined $rmgr{ $conf{rmgr} } ) {
+    if ( defined $conf{rmgr} ) {
+        if ( not defined $rmgr{ $conf{rmgr} } ) {
+            printf("Error, resource manager \"$conf{rmgr}\" not  
supported\n");
+            exit(1);
+        }
+
          if ( defined $rmgr{ $conf{rmgr} }{is_installed}
              and not $rmgr{ $conf{rmgr} }{is_installed}() )
          {
@@ -2663,11 +2668,6 @@
          setup_rmgr( $conf{rmgr} );
          return;
      }
-
-    if ( $conf{rmgr} ne "auto" ) {
-        printf("Error, resource manager \"$conf{rmgr}\" not supported\n");
-        exit(1);
-    }

      my @ok;
      foreach my $res ( sort( keys %rmgr ) ) {
@@ -2699,7 +2699,12 @@
  # If it's been set on the command line and it's valid then just use what  
we are given.
  # Do sanity checks here but only warn on the result to cope with  
non-default installs.

-    if ( defined $rmgr{ $conf{rmgr} } ) {
+    if ( defined $conf{rmgr} ) {
+        if ( not defined $rmgr{ $conf{rmgr} } ) {
+            printf("Error, resource manager \"$conf{rmgr}\" not  
supported\n");
+            exit(1);
+        }
+
          if ( defined $rmgr{ $conf{rmgr} }{is_installed}
              and not $rmgr{ $conf{rmgr} }{is_installed}() )
          {
@@ -2710,11 +2715,6 @@
          setup_rmgr( $conf{rmgr} );
          return;
      }
-
-    if ( $conf{rmgr} ne "auto" ) {
-        printf("Error, resource manager \"$conf{rmgr}\" not supported\n");
-        exit(1);
-    }

      my @installed;
      foreach my $res ( sort( keys %rmgr ) ) {