[28576] in Source-Commits
delete commit: Don't suck at Boolean logic in perror()
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon Dec 21 14:32:14 2015
Date: Mon, 21 Dec 2015 14:32:12 -0500
From: Jonathan D Reed <jdreed@mit.edu>
Message-Id: <201512211932.tBLJWCuP012141@drugstore.mit.edu>
To: source-commits@mit.edu
https://github.com/mit-athena/delete/commit/245e7c35522f4ddf33a2fabee157c2aae133e864
commit 245e7c35522f4ddf33a2fabee157c2aae133e864
Author: Jonathan Reed <jdreed@mit.edu>
Date: Mon Dec 21 14:31:29 2015 -0500
Don't suck at Boolean logic in perror()
- Fix error reporting to correctly set options.report_errors in
delete to mean what it says it means
- Do not invert the defintion of "maybe" in perror (undelete, delete)
(Trac: #1568)
delete | 4 ++--
undelete | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/delete b/delete
index 054d1cd..58cb9c6 100755
--- a/delete
+++ b/delete
@@ -47,7 +47,7 @@ def perror(message, **kwargs):
Format an error message, log it in the debug log
and maybe also print it to stderr.
"""
- should_print = not kwargs.pop('_maybe', False)
+ should_print = kwargs.pop('_maybe', False)
msg = "{0}: {1}".format(whoami, message.format(**kwargs))
logger.debug("Error: %s", msg)
if should_print:
@@ -176,7 +176,7 @@ def main():
parser.error("-r and -D are mutually exclusive")
if len(args) < 1:
parser.error("No files or directories specified.")
- options.report_errors = not options.emulate_rm or not options.force
+ options.report_errors = not (options.emulate_rm or options.force)
errors = 0
for filename in args:
# Because you know _someone_ will try it
diff --git a/undelete b/undelete
index d63d260..e3ba7ac 100755
--- a/undelete
+++ b/undelete
@@ -45,7 +45,7 @@ def perror(message, **kwargs):
Format an error message, log it in the debug log
and maybe also print it to stderr.
"""
- should_print = not kwargs.pop('_maybe', False)
+ should_print = kwargs.pop('_maybe', False)
msg = "{0}: {1}".format(whoami, message.format(**kwargs))
logger.debug("Error: %s", msg)
if should_print:
