diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 99c7007..4d99de9 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -49,7 +49,7 @@ - A new directive, .notify, tells tsshbatch to print an informative message from within a command file. This is a runtime activity and is helpful, for example, when tracking progress of a long - command file. + command file. Notifications are disabled in silent mode. [CHANGES] diff --git a/tsshbatch.py b/tsshbatch.py index afad99e..88b4305 100755 --- a/tsshbatch.py +++ b/tsshbatch.py @@ -14,8 +14,8 @@ # Version Information - Overwritten by makefile during release process ##### -GITID = '48da8ac tundra Tue Oct 11 09:15:36 2016 -0500' -VERSION = '1.312' +GITID = '8eb2a8e tundra Tue Oct 11 20:50:17 2016 -0500' +VERSION = '1.313' ##### @@ -497,10 +497,11 @@ if not command: continue - # Process notifications + # Process notifications - disabled in SILENT mode if command.startswith(NOTIFY): - PrintReport([NOTIFICATION, " ".join(command.split(NOTIFY)).strip() + '\n'], HANDLER=PrintStdout) + if NOISELEVEL != SILENT: + PrintReport([NOTIFICATION, " ".join(command.split(NOTIFY)).strip() + '\n'], HANDLER=PrintStdout) continue # If this is a sudo run, force password to be read diff --git a/tsshbatch.rst b/tsshbatch.rst index 979b0c6..d097b9b 100644 --- a/tsshbatch.rst +++ b/tsshbatch.rst @@ -412,7 +412,8 @@ Notifications are entirely optional *and do not run on the remote host*. Think of them as runtime comments emitted by ``tsshbatch`` to -help you know what's going on. +help you know what's going on. Notifications are supressed if you +select silent operation (``-s``). You can also specify file transfers within a command file. See the section below on file transfers for all the details. @@ -1449,7 +1450,7 @@ :: - $Id: '48da8ac tundra Tue Oct 11 09:15:36 2016 -0500' + $Id: '8eb2a8e tundra Tue Oct 11 20:50:17 2016 -0500' This document was produced with ``emacs``, ``RestructuredText``, and ``TeX Live``. diff --git a/version b/version index 117ddda..95f4af1 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.312 +1.313