Ubuntu Distributed Development

Merge lp:~vila/udd/use-local-bzr into lp:udd

  1. use-local-bzr
  2. Merge into import-scripts
Proposed by Vincent Ladeuil
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: 545
Merged at revision: 545
Proposed branch: lp:~vila/udd/use-local-bzr
Merge into: lp:udd
Diff against target: 55 lines (+8/-5)
4 files modified
README (+1/-1)
etc-init.d-mass-import (+3/-2)
fixit.sh (+2/-1)
importer.crontab (+2/-1)
To merge this branch: bzr merge lp:~vila/udd/use-local-bzr
Reviewer Review Type Date Requested Status
Jelmer Vernooij (community) Approve
Review via email: mp+81555@code.launchpad.net

Description of the change

This patch allows the package importer to use a local version of bzrlib if
it's locally installed.

This would allow us to use more recent versions of bzr without going the
looong route of releasing a stable version with a fix and have this release
land on jubany.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README'
2--- README 2011-10-21 10:17:16 +0000
3+++ README 2011-11-08 11:04:53 +0000
4@@ -70,7 +70,7 @@
5
6 * ``--keep-temp``: Keep temporary directories,
7
8-* ``--local-branches``: Use loca copies of lp branches (created if needed),
9+* ``--local-branches``: Use local copies of lp branches (created if needed),
10
11 * ``UDD_DEBUG_HTTP``: Environment variable controlling the display on stdout
12 of the launchpad http API calls,
13
14=== modified file 'etc-init.d-mass-import'
15--- etc-init.d-mass-import 2011-10-25 10:44:45 +0000
16+++ etc-init.d-mass-import 2011-11-08 11:04:53 +0000
17@@ -1,9 +1,10 @@
18 #!/bin/sh
19
20 export BASEDIR=/srv/package-import.canonical.com/new
21-# We need ${BASEDIR}/script for our local dpkg-mergechangelogs
22+# We need ${BASEDIR}/scripts for our local dpkg-mergechangelogs
23 export PATH=${BASEDIR}/scripts:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
24-export PYTHONPATH=${BASEDIR}/scripts
25+# 1) 'scripts' contains the udd library. 2) If a local bzr is installed, use it
26+export PYTHONPATH=${BASEDIR}/scripts:${BASEDIR}/bzr
27 NAME=mass-import
28 DAEMON=${BASEDIR}/scripts/bin/mass-import
29 PIDFILE=${BASEDIR}/mass-import.pid
30
31=== modified file 'fixit.sh'
32--- fixit.sh 2011-10-25 07:37:43 +0000
33+++ fixit.sh 2011-11-08 11:04:53 +0000
34@@ -13,7 +13,8 @@
35
36 export BASEDIR=/srv/package-import.canonical.com/new
37 export PATH=${BASEDIR}/scripts/bin:${PATH}
38-export PYTHONPATH=${BASEDIR}/scripts
39+# 1) 'scripts' contains the udd library. 2) If a local bzr is installed, use it
40+export PYTHONPATH=${BASEDIR}/scripts:${BASEDIR}/bzr
41 export BZR_PLUGIN_PATH=${BASEDIR}/scripts/plugins
42 export LANG="en_GB.UTF-8"
43 export BZR_EMAIL="Package Import Robot <package-import@ubuntu.com>"
44
45=== modified file 'importer.crontab'
46--- importer.crontab 2011-10-25 07:37:43 +0000
47+++ importer.crontab 2011-11-08 11:04:53 +0000
48@@ -1,5 +1,6 @@
49 SCRIPTS_DIR=/srv/package-import.canonical.com/new/scripts/bin
50-PYTHONPATH=/srv/package-import.canonical.com/new/scripts
51+# 1) 'scripts' contains the udd library. 2) If a local bzr is installed, use it
52+PYTHONPATH=/srv/package-import.canonical.com/new/scripts:/srv/package-import.canonical.com/new/bzr
53 # m h dom mon dow command
54 17 * * * * /usr/bin/python ${SCRIPTS_DIR}/logrotate
55 */5 * * * * /usr/bin/python ${SCRIPTS_DIR}/categorise-failures

Subscribers

People subscribed via source and target branches