summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-05-08 12:12:19 +0200
committerHolger Levsen <holger@layer-acht.org>2015-05-08 12:12:19 +0200
commit4d14b4c6941fe64cafce8e34ae91155c8d0c6bb8 (patch)
tree0543d5ffa7536bd08685b61b7dbc1615e6b7ba81
parente22e8d5e335af7f41e1947aad1a514f71677e57e (diff)
downloadjenkins.debian.net-4d14b4c6941fe64cafce8e34ae91155c8d0c6bb8.tar.xz
fixup language
-rwxr-xr-xbin/reproducible_db_maintenance.py2
-rwxr-xr-xbin/reproducible_remote_scheduler.py21
2 files changed, 12 insertions, 11 deletions
diff --git a/bin/reproducible_db_maintenance.py b/bin/reproducible_db_maintenance.py
index 74f37c21..0e4bef24 100755
--- a/bin/reproducible_db_maintenance.py
+++ b/bin/reproducible_db_maintenance.py
@@ -365,7 +365,7 @@ schema_updates = {
# IRC notification
'ALTER TABLE schedule ADD COLUMN notify TEXT',
'INSERT INTO rb_schema VALUES ("12", "' + now + '")'],
- 13: [ # take note of the manual scheduling done, to limit people
+ 13: [ # record manual scheduling done, to be able to limit people
'''CREATE TABLE manual_scheduler (
id INTEGER PRIMARY KEY,
package_id INTEGER NOT NULL,
diff --git a/bin/reproducible_remote_scheduler.py b/bin/reproducible_remote_scheduler.py
index 0b387387..dce8a504 100755
--- a/bin/reproducible_remote_scheduler.py
+++ b/bin/reproducible_remote_scheduler.py
@@ -13,16 +13,16 @@ import argparse
parser = argparse.ArgumentParser(
- description='Reschedule packages to re-test their reproducibly',
- epilog='You can wait for the results on #debian-reproducible, where the ' +
- 'build will be announced')
+ description='Reschedule packages to re-test their reproducibility',
+ epilog='The build results will be announced on the #debian-reproducible' +
+ ' IRC channel.')
parser.add_argument('-a', '--artifacts', default=False, action='store_true',
help='Save artifacts (for further offline study)')
parser.add_argument('-s', '--suite', required=True,
- help='Specify the suite to schedule for')
+ help='Specify the suite to schedule in')
parser.add_argument('-m', '--message', default='',
- help='A text to be sent to the channel while notifing ' +
- 'the scheduling')
+ help='A text to be sent to the IRC channel when notifying' +
+ ' about the scheduling')
parser.add_argument('packages', metavar='package', nargs='+',
help='list of packages to reschedule')
scheduling_args = parser.parse_known_args()[0]
@@ -61,7 +61,7 @@ log.debug('Architecture: ' + defaultarch)
log.debug('Suite: ' + suite)
if suite not in SUITES:
- log.critical('The specified suite is not in the available ones.')
+ log.critical('The specified suite is not being tested.')
log.critical('Please chose between ' + ', '.join(SUITES))
sys.exit(1)
@@ -118,9 +118,10 @@ except IndexError:
amount = 0
log.debug(requester + ' already scheduled ' + str(amount) + ' packages today')
if amount + len(ids) > 50:
- log.error(bcolors.FAIL + 'You exceeded the maximun amount of manual ' +
- 'rescheduling for today. Please ask in #debian-reproducible ' +
- 'if need to schedule more packages.' + bcolors.ENDC)
+ log.error(bcolors.FAIL + 'You have exceeded the maximun number of manual ' +
+ 'rescheduling allowed for a day. Please ask in ' +
+ '#debian-reproducible if you need to schedule more packages.' +
+ bcolors.ENDC)
sys.exit(1)