svn merge -r8726:8729 https://eris.llnl.gov/svn/slurm/branches/slurm-1.1

NEWS

@@ -1791,7 +1791,7 @@ documents those changes that are of interest to users and admins.
  
 * Changes in SLURM 0.2.0-pre2
 =============================
- 
+  
  -- Fix for reconfigure when public/private key path is changed.
  -- Shared memory fixes in slurmd. 
    - fix for infinite semaphore incrementation bug.

testsuite/expect/globals

@@ -339,7 +339,7 @@ proc wait_for_job { job_id desired_state } {
     while 1 {
 	set fd [open "|$scontrol -o show job $job_id"]
 	gets $fd line
-	close $fd
+	catch {close $fd}
 	if {[regexp {JobState\s*=\s*(\w+)} $line foo state] != 1} {
 	    set state "NOT_FOUND"
 	}
@@ -642,7 +642,7 @@ proc available_nodes { partition } {
     send_user "$sinfo --noheader --partition $partition --state idle,alloc,comp --format %D\n"
     set fd [open "|$sinfo --noheader --partition $partition --state idle,alloc,comp --format %D"]
     gets $fd line
-    catch [close $fd]
+    catch {close $fd}
     regexp {\d+} $line available
     return $available
 }
@@ -669,7 +669,7 @@ proc default_partition {} {
 	    break
 	}
     }
-    catch [close $fd]
+    catch {close $fd}
 
     if {[string length $name] == 0} {
 	send_user "ERROR: could not identify the default partition"