reproducible: make irc notifications optional instead of the default again

2 files changed, 8 insertions, 8 deletions

diff --git a/README b/README
index ec72e86a..64a4a676 100644
--- a/README
+++ b/README
@@ -162,9 +162,9 @@ Installation tests inside chroot environments.
 
 * If you are in the reproducible team you can reschedule packages by yourself:
 ** log into alioth.debian.org via ssh, in the team home (/home/groups/reproducible/) there is a reschedule.sh script you can call. Use the --help switch to get the online help.
-** The team IRC channel will get a notification both when the scheduling is done and once the build finishes.
+** The team IRC channel will get a notification about the scheduling and optionally when the build finishes too.
 
-* If you are not in the reproducible team or if you want to reschedule big sets of packages please ask for a manual rescheduling in the '#debian-reproducible' IRC channel on OFTC. Those with shell access to jenkins can bypass the limitations imposed to remote calls (and e.g. schedule a lot of packages (remotes are limited at 50 per day) without notifications at the end).
+* If you are not in the reproducible team or if you want to reschedule big sets of packages please ask for a manual rescheduling in the '#debian-reproducible' IRC channel on OFTC. Those with shell access to jenkins can bypass the limitations imposed to remote calls, which are limited to 50 schedulings per day.
 
 * Blacklisting packages can be done similarly:
 
diff --git a/bin/reproducible_remote_scheduler.py b/bin/reproducible_remote_scheduler.py
index b12786c5..f18f9110 100755
--- a/bin/reproducible_remote_scheduler.py
+++ b/bin/reproducible_remote_scheduler.py
@@ -15,14 +15,14 @@ import argparse
 parser = argparse.ArgumentParser(
     description='Reschedule packages to re-test their reproducibility',
     epilog='The build results will be announced on the #debian-reproducible' +
-           ' IRC channel unless -n is provided.\nSpecifying both -r and -i ' +
+           ' IRC channel if -n is provided.\nSpecifying both -r and -i ' +
            'means "all packages with that issue AND that status"')
 group = parser.add_mutually_exclusive_group()
 parser.add_argument('--dry-run', action='store_true')
 group.add_argument('-a', '--artifacts', default=False, action='store_true',
                    help='Save artifacts (for further offline study)')
-group.add_argument('-n', '--no-notify', default=False, action='store_true',
-                   help='Do not notify the channel when the build finishes')
+group.add_argument('-n', '--notify', default=False, action='store_true',
+                   help='Notify the channel when the build finishes')
 parser.add_argument('--noisy', action='store_true', help='Also notify when ' +
                     'the build starts, linking to the build url. This disables -n.')
 parser.add_argument('-m', '--message', default='', nargs='+',
@@ -80,7 +80,7 @@ built_after = scheduling_args.after
 built_before = scheduling_args.before
 packages = scheduling_args.packages
 artifacts = scheduling_args.artifacts
-notify = not scheduling_args.no_notify or scheduling_args.noisy
+notify = scheduling_args.notify or scheduling_args.noisy
 debug_url = scheduling_args.noisy
 dry_run = scheduling_args.dry_run
 
@@ -132,8 +132,8 @@ if len(packages) > 50 and notify:
     log.critical(bcolors.RED + bcolors.BOLD)
     call(['figlet', 'No.'])
     log.critical(bcolors.FAIL + 'Do not reschedule more than 50 packages ' +
-                 'with notification.\nIf you really need to spam the IRC ' +
-                 'channel this much use a loop to achive that.' + bcolors.ENDC)
+                 'with notification.\nIf you think you need to do this, ' +
+                 'please discuss this with the IRC channel first.' + bcolors.ENDC)
     sys.exit(1)
 
 if artifacts: