summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBarry Warsaw2010-03-28 17:38:03 -0400
committerBarry Warsaw2010-03-28 17:38:03 -0400
commit40f3c0cb594f8a4a918ec2974f442de73455b6ef (patch)
tree3400346084348115ffd4dca8a62586e5b0bbd3eb /src
parente2e024972d130f919890bb84aeab02354e0ff5c1 (diff)
downloadmailman-40f3c0cb594f8a4a918ec2974f442de73455b6ef.tar.gz
mailman-40f3c0cb594f8a4a918ec2974f442de73455b6ef.tar.zst
mailman-40f3c0cb594f8a4a918ec2974f442de73455b6ef.zip
Diffstat (limited to 'src')
-rw-r--r--src/mailman/commands/cli_info.py4
-rw-r--r--src/mailman/config/config.py10
2 files changed, 7 insertions, 7 deletions
diff --git a/src/mailman/commands/cli_info.py b/src/mailman/commands/cli_info.py
index 98a025673..1a4ea75b4 100644
--- a/src/mailman/commands/cli_info.py
+++ b/src/mailman/commands/cli_info.py
@@ -51,7 +51,7 @@ class Info:
File to send the output to. If not given, standard output is
used."""))
command_parser.add_argument(
- '-p', '--paths',
+ '-v', '--verbose',
action='store_true', help=_("""\
A more verbose output including the file system paths that Mailman
is using."""))
@@ -68,7 +68,7 @@ class Info:
print >> output, 'Python', sys.version
print >> output, 'config file:', config.filename
print >> output, 'db url:', config.db.url
- if args.paths:
+ if args.verbose:
print >> output, 'File system paths:'
longest = 0
paths = {}
diff --git a/src/mailman/config/config.py b/src/mailman/config/config.py
index 224f2a8ae..6d0e48ef1 100644
--- a/src/mailman/config/config.py
+++ b/src/mailman/config/config.py
@@ -208,11 +208,11 @@ class Configuration:
# Ensure that all paths are normalized and made absolute. Handle the
# few special cases first. Most of these are due to backward
# compatibility.
- self.PUBLIC_ARCHIVE_FILE_DIR = substitutions.pop(
- 'pipermail_public_dir')
- self.PRIVATE_ARCHIVE_FILE_DIR = substitutions.pop(
- 'pipermail_private_dir')
- self.PID_FILE = substitutions.pop('pid_file')
+ self.PUBLIC_ARCHIVE_FILE_DIR = os.path.abspath(
+ substitutions.pop('pipermail_public_dir'))
+ self.PRIVATE_ARCHIVE_FILE_DIR = os.path.abspath(
+ substitutions.pop('pipermail_private_dir'))
+ self.PID_FILE = os.path.abspath(substitutions.pop('pid_file'))
for key in substitutions:
attribute = key.upper()
setattr(self, attribute, os.path.abspath(substitutions[key]))