Merge zizzer:/bk/m5

into  zeep.eecs.umich.edu:/z/saidi/work/m5

--HG--
extra : convert_revision : 3cc23080d19cc464a8ba7c1c93b6e5d45af7d463

2 files changed, 8 insertions, 3 deletions

diff --git a/util/pbs/pbs.py b/util/pbs/pbs.py
index 292ddf1f9..21c2cb89d 100755
--- a/util/pbs/pbs.py
+++ b/util/pbs/pbs.py
@@ -147,6 +147,8 @@ class qsub:
                 flags.append('e')
             if len(flags):
                 self.cmd.append('-m ' + flags)
+        else:
+            self.cmd.append('-mn')
 
         if self.name:
             self.cmd.append("-N%s" % self.name)
@@ -158,7 +160,7 @@ class qsub:
             self.cmd.append('-q' + self.queue)
 
         if self.afterok:
-            self.cmd.append('-Wdepend=afterok:%s' % self.after)
+            self.cmd.append('-Wdepend=afterok:%s' % self.afterok)
 
         self.cmd.extend(args)
         self.script = script
diff --git a/util/pbs/send.py b/util/pbs/send.py
index 1f48b2b0e..54bba931d 100755
--- a/util/pbs/send.py
+++ b/util/pbs/send.py
@@ -98,7 +98,7 @@ Usage:
 
 try:
     import getopt
-    opts, args = getopt.getopt(sys.argv[1:], '-Ccdefhj:lq:Rt:v')
+    opts, args = getopt.getopt(sys.argv[1:], '-Ccdefhj:lnq:Rt:v')
 except getopt.GetoptError:
     sys.exit(usage)
 
@@ -115,6 +115,7 @@ docpts = False
 doruns = True
 runflag = False
 node_type = 'FAST'
+update = True
 
 for opt,arg in opts:
     if opt == '-C':
@@ -134,6 +135,8 @@ for opt,arg in opts:
         jfile = arg
     if opt == '-l':
         listonly = True
+    if opt == '-n':
+        update = False
     if opt == '-q':
         queue = arg
     if opt == '-R':
@@ -154,7 +157,7 @@ from job import JobDir, date
 
 conf = jobfile.JobFile(jfile)
 
-if not listonly and not onlyecho and isdir(conf.linkdir):
+if update and not listonly and not onlyecho and isdir(conf.linkdir):
     if verbose:
         print 'Checking for outdated files in Link directory'
     if not isdir(conf.basedir):