launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad/normalise-mlist-sync into lp:launchpad.

Commit message:
mlist-sync.py doesn't need to be generated by buildout; it can just be a normal script.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/normalise-mlist-sync/+merge/314972
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/normalise-mlist-sync into lp:launchpad.

=== modified file '.bzrignore'
--- .bzrignore	2016-09-14 11:13:06 +0000
+++ .bzrignore	2017-01-17 23:25:12 +0000
@@ -75,7 +75,6 @@
 lib/canonical/launchpad/icing/yui
 .emacs.desktop
 callgrind.out.*
-scripts/mlist-sync.py
 ./celerybeat-schedule
 !logs/README.txt
 ./logs

=== modified file 'Makefile'
--- Makefile	2016-09-21 02:51:58 +0000
+++ Makefile	2017-01-17 23:25:12 +0000
@@ -353,7 +353,6 @@
 	$(RM) .installed.cfg
 	$(RM) _pythonpath.py
 	$(RM) -r yui/*
-	$(RM) scripts/mlist-sync.py
 
 clean_logs:
 	$(RM) logs/thread*.request

=== removed directory 'buildout-templates/scripts'
=== renamed file 'buildout-templates/scripts/mlist-sync.py.in' => 'scripts/mlist-sync.py'
--- buildout-templates/scripts/mlist-sync.py.in	2013-01-07 03:29:28 +0000
+++ scripts/mlist-sync.py	2017-01-17 23:25:12 +0000
@@ -1,18 +1,11 @@
-#!${buildout:executable} -S
+#!/usr/bin/python -S
 
-# Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2017 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Sync Mailman data from one Launchpad to another."""
 
-# Initialize our paths.
-${python-relative-path-setup}
-
-import sys
-sys.path.insert(0, ${scripts:parts-directory|path-repr})
-import site
-
-# Run the script.
+import _pythonpath
 
 # XXX BarryWarsaw 2008-02-12:
 # Things this script does NOT do correctly.
@@ -33,8 +26,6 @@
 #   Not doing this means that some of the links in staging's MHonArc archive
 #   will point to production archives.
 
-import _pythonpath
-
 import logging
 import os
 import subprocess