1
=== modified file 'src/mailman/commands/cli_control.py'
2
--- src/mailman/commands/cli_control.py	2015-01-20 19:53:16 +0000
3
+++ src/mailman/commands/cli_control.py	2015-04-20 01:39:24 +0000
4
@@ -56,7 +56,7 @@
5
56
            default=False, action='store_true',
56
            default=False, action='store_true',
6
57
            help=_("""\
57
            help=_("""\
7
58
            If the master watcher finds an existing master lock, it will
58
            If the master watcher finds an existing master lock, it will
9
59
            normally exit with an error message.  With this option,the master
59
            normally exit with an error message.  With this option, the master
10
60
            will perform an extra level of checking.  If a process matching
60
            will perform an extra level of checking.  If a process matching
11
61
            the host/pid described in the lock file is running, the master
61
            the host/pid described in the lock file is running, the master
12
62
            will still exit, requiring you to manually clean up the lock.  But
62
            will still exit, requiring you to manually clean up the lock.  But
13
@@ -78,7 +78,7 @@
14
78
            This flag is not recommended for normal production environments.
78
            This flag is not recommended for normal production environments.
15
79
79
16
80
            Note though, that if you run with -u and are not in the mailman
80
            Note though, that if you run with -u and are not in the mailman
18
81
            group, you may have permission problems, such as begin unable to
81
            group, you may have permission problems, such as being unable to
19
82
            delete a list's archives through the web.  Tough luck!"""))
82
            delete a list's archives through the web.  Tough luck!"""))
20
83
        command_parser.add_argument(
83
        command_parser.add_argument(
21
84
            '-q', '--quiet',
84
            '-q', '--quiet',
Status:	Merged
Merged at revision:	7333
Proposed branch:	lp:~sumanah/mailman/commafix
Merge into:	lp:mailman
Diff against target:	21 lines (+2/-2) 1 file modified src/mailman/commands/cli_control.py (+2/-2)
To merge this branch:	bzr merge lp:~sumanah/mailman/commafix
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Barry Warsaw		2015-04-20	Pending
Review via email: mp+256764@code.launchpad.net
1	=== modified file 'src/mailman/commands/cli_control.py'
2	--- src/mailman/commands/cli_control.py 2015-01-20 19:53:16 +0000
3	+++ src/mailman/commands/cli_control.py 2015-04-20 01:39:24 +0000
4	@@ -56,7 +56,7 @@
5	56	default=False, action='store_true',	56	default=False, action='store_true',
6	57	help=_("""\	57	help=_("""\
7	58	If the master watcher finds an existing master lock, it will	58	If the master watcher finds an existing master lock, it will
9	59	normally exit with an error message. With this option,the master	59	normally exit with an error message. With this option, the master
10	60	will perform an extra level of checking. If a process matching	60	will perform an extra level of checking. If a process matching
11	61	the host/pid described in the lock file is running, the master	61	the host/pid described in the lock file is running, the master
12	62	will still exit, requiring you to manually clean up the lock. But	62	will still exit, requiring you to manually clean up the lock. But
13	@@ -78,7 +78,7 @@
14	78	This flag is not recommended for normal production environments.	78	This flag is not recommended for normal production environments.
15	79		79
16	80	Note though, that if you run with -u and are not in the mailman	80	Note though, that if you run with -u and are not in the mailman
18	81	group, you may have permission problems, such as begin unable to	81	group, you may have permission problems, such as being unable to
19	82	delete a list's archives through the web. Tough luck!"""))	82	delete a list's archives through the web. Tough luck!"""))
20	83	command_parser.add_argument(	83	command_parser.add_argument(
21	84	'-q', '--quiet',	84	'-q', '--quiet',