Ubuntu Distributed Development

Merge lp:~maxb/udd/pythonpath-1 into lp:udd

  1. pythonpath-1
  2. Merge into import-scripts
Proposed by Max Bowsher
Status: Merged
Approved by: James Westby
Approved revision: 593
Merged at revision: 593
Proposed branch: lp:~maxb/udd/pythonpath-1
Merge into: lp:udd
Diff against target: 323 lines (+51/-96)
21 files modified
bin/_path.py (+7/-0)
bin/add-import-jobs (+1/-3)
bin/analyze-log (+2/-7)
bin/branch-branches-from-lp (+2/-5)
bin/categorise-failures (+2/-5)
bin/count-outstanding-jobs (+2/-5)
bin/delete-branches-from-lp (+2/-5)
bin/email-failures (+2/-5)
bin/graph-failures (+2/-5)
bin/import-package (+2/-6)
bin/list-packages (+2/-6)
bin/logrotate (+2/-7)
bin/mass-import (+2/-5)
bin/requeue-package (+2/-5)
bin/set-official (+2/-5)
bin/show-failure (+2/-5)
etc-init.d-mass-import (+3/-4)
fixit.sh (+3/-4)
importer.crontab (+3/-4)
udd/scripts/analyze_log.py (+4/-4)
udd/scripts/logrotate.py (+2/-1)
To merge this branch: bzr merge lp:~maxb/udd/pythonpath-1
Reviewer Review Type Date Requested Status
James Westby Approve
Review via email: mp+104696@code.launchpad.net

Description of the change

The primary motivation of this branch is to make all of the bin/* scripts automatically set up the Python path in order to be able to access the udd.* Python modules from the same branch, without any external wrapper assistance.

Because of a previous attempt (https://code.launchpad.net/~maxb/udd/environment-setup/+merge/101307) becoming mired, it very specifically only attempts to address the single path element of the udd.* modules themselves, and does not address the requirement on jubany to run with an overridden bzrlib and distro-info.

Even so, this change alone is enough to make the various bin/* scripts usefully invokable on a Precise machine without PYTHONPATH preparation.

Along with the main thrust of this branch as above, a number of minor cleanups are included, each in a separate revision - I recommend reviewing this branch revision by revision, *not* reviewing the aggregate diff.

To post a comment you must log in.
Revision history for this message
James Westby (james-w) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added file 'bin/_path.py'
--- bin/_path.py 1970-01-01 00:00:00 +0000
+++ bin/_path.py 2012-05-04 07:57:18 +0000
@@ -0,0 +1,7 @@
1import os
2import sys
3
4udd_scripts_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
5
6# scripts branch root contains the udd library
7sys.path.insert(0, udd_scripts_root)
08
=== modified file 'bin/add-import-jobs'
--- bin/add-import-jobs 2011-10-21 10:17:16 +0000
+++ bin/add-import-jobs 2012-05-04 07:57:18 +0000
@@ -1,6 +1,4 @@
1#!/usr/bin/python1#!/usr/bin/python
22import _path
3from udd.scripts.add_import_jobs import main3from udd.scripts.add_import_jobs import main
4
5
6main()4main()
75
=== modified file 'bin/analyze-log'
--- bin/analyze-log 2011-10-21 10:17:16 +0000
+++ bin/analyze-log 2012-05-04 07:57:18 +0000
@@ -1,11 +1,6 @@
1#!/usr/bin/python1#!/usr/bin/python
2"""Analyzes the package importer log files collecting various historical data.2"""Analyzes the package importer log files collecting various historical data.
3"""3"""
44import _path
5import sys
6
7from udd.scripts.analyze_log import main5from udd.scripts.analyze_log import main
86main()
9
10if __name__ == '__main__':
11 main(sys.argv)
127
=== modified file 'bin/branch-branches-from-lp'
--- bin/branch-branches-from-lp 2011-10-21 10:17:16 +0000
+++ bin/branch-branches-from-lp 2012-05-04 07:57:18 +0000
@@ -1,9 +1,6 @@
1#!/usr/bin/python1#!/usr/bin/python
2# Script to create local branches from all existing official package branches2# Script to create local branches from all existing official package branches
3# of a package, for debugging purposes.3# of a package, for debugging purposes.
44import _path
5from udd.scripts.branch_branches_from_lp import main5from udd.scripts.branch_branches_from_lp import main
66main()
7
8if __name__ == '__main__':
9 main()
107
=== modified file 'bin/categorise-failures'
--- bin/categorise-failures 2011-10-21 10:17:16 +0000
+++ bin/categorise-failures 2012-05-04 07:57:18 +0000
@@ -1,7 +1,4 @@
1#!/usr/bin/python1#!/usr/bin/python
22import _path
3from udd.scripts.categorise_failures import main3from udd.scripts.categorise_failures import main
44main()
5
6if __name__ == '__main__':
7 main()
85
=== modified file 'bin/count-outstanding-jobs'
--- bin/count-outstanding-jobs 2011-10-21 10:17:16 +0000
+++ bin/count-outstanding-jobs 2012-05-04 07:57:18 +0000
@@ -1,7 +1,4 @@
1#!/usr/bin/python1#!/usr/bin/python
22import _path
3from udd.scripts.count_outstanding_jobs import main3from udd.scripts.count_outstanding_jobs import main
44main()
5
6if __name__ == '__main__':
7 main()
85
=== modified file 'bin/delete-branches-from-lp'
--- bin/delete-branches-from-lp 2011-10-21 10:17:16 +0000
+++ bin/delete-branches-from-lp 2012-05-04 07:57:18 +0000
@@ -1,7 +1,4 @@
1#!/usr/bin/python1#!/usr/bin/python
22import _path
3from udd.scripts.delete_branches_from_lp import main3from udd.scripts.delete_branches_from_lp import main
44main()
5
6if __name__ == '__main__':
7 main()
85
=== modified file 'bin/email-failures'
--- bin/email-failures 2011-10-21 10:17:16 +0000
+++ bin/email-failures 2012-05-04 07:57:18 +0000
@@ -1,7 +1,4 @@
1#!/usr/bin/python1#!/usr/bin/python
22import _path
3from udd.scripts.email_failures import main3from udd.scripts.email_failures import main
44main()
5
6if __name__ == '__main__':
7 main()
85
=== modified file 'bin/graph-failures'
--- bin/graph-failures 2011-10-21 10:17:16 +0000
+++ bin/graph-failures 2012-05-04 07:57:18 +0000
@@ -1,7 +1,4 @@
1#!/usr/bin/python1#!/usr/bin/python
22import _path
3from udd.scripts.graph_failures import main3from udd.scripts.graph_failures import main
44main()
5
6if __name__ == '__main__':
7 main()
85
=== modified file 'bin/import-package'
--- bin/import-package 2011-12-08 18:01:01 +0000
+++ bin/import-package 2012-05-04 07:57:18 +0000
@@ -1,8 +1,4 @@
1#!/usr/bin/python1#!/usr/bin/python
22import _path
3from udd.scripts.import_package import main3from udd.scripts.import_package import main
44main()
5
6if __name__ == '__main__':
7 main()
8
95
=== modified file 'bin/list-packages'
--- bin/list-packages 2011-10-21 10:17:16 +0000
+++ bin/list-packages 2012-05-04 07:57:18 +0000
@@ -1,9 +1,5 @@
1#!/usr/bin/python1#!/usr/bin/python
2
3"""Get a list of packages from Launchpad and store them in the local database."""2"""Get a list of packages from Launchpad and store them in the local database."""
43import _path
5from udd.scripts.list_packages import main4from udd.scripts.list_packages import main
65main()
7
8if __name__ == '__main__':
9 main()
106
=== modified file 'bin/logrotate'
--- bin/logrotate 2011-10-21 10:17:16 +0000
+++ bin/logrotate 2012-05-04 07:57:18 +0000
@@ -1,11 +1,6 @@
1#!/usr/bin/python1#!/usr/bin/python
2"""Invoke logrotate for the package importer taking configuration into account.2"""Invoke logrotate for the package importer taking configuration into account.
3"""3"""
44import _path
5import sys
6
7from udd.scripts.logrotate import main5from udd.scripts.logrotate import main
86main()
9
10if __name__ == '__main__':
11 sys.exit(main())
127
=== modified file 'bin/mass-import'
--- bin/mass-import 2011-10-21 10:17:16 +0000
+++ bin/mass-import 2012-05-04 07:57:18 +0000
@@ -1,7 +1,4 @@
1#!/usr/bin/python1#!/usr/bin/python
22import _path
3from udd.scripts.mass_import import main3from udd.scripts.mass_import import main
44main()
5
6if __name__ == '__main__':
7 main()
85
=== modified file 'bin/requeue-package'
--- bin/requeue-package 2011-10-21 10:17:16 +0000
+++ bin/requeue-package 2012-05-04 07:57:18 +0000
@@ -1,7 +1,4 @@
1#!/usr/bin/python1#!/usr/bin/python
22import _path
3from udd.scripts.requeue_package import main3from udd.scripts.requeue_package import main
44main()
5
6if __name__ == '__main__':
7 main()
85
=== modified file 'bin/set-official'
--- bin/set-official 2011-10-21 10:17:16 +0000
+++ bin/set-official 2012-05-04 07:57:18 +0000
@@ -1,7 +1,4 @@
1#!/usr/bin/python1#!/usr/bin/python
22import _path
3from udd.scripts.set_official import main3from udd.scripts.set_official import main
44main()
5
6if __name__ == '__main__':
7 main()
85
=== modified file 'bin/show-failure'
--- bin/show-failure 2011-10-21 10:17:16 +0000
+++ bin/show-failure 2012-05-04 07:57:18 +0000
@@ -1,7 +1,4 @@
1#!/usr/bin/python1#!/usr/bin/python
22import _path
3from udd.scripts.show_failure import main3from udd.scripts.show_failure import main
44main()
5
6if __name__ == '__main__':
7 main()
85
=== modified file 'etc-init.d-mass-import'
--- etc-init.d-mass-import 2011-11-08 13:06:03 +0000
+++ etc-init.d-mass-import 2012-05-04 07:57:18 +0000
@@ -3,10 +3,9 @@
3export BASEDIR=/srv/package-import.canonical.com/new3export BASEDIR=/srv/package-import.canonical.com/new
4# We need ${BASEDIR}/scripts for our local dpkg-mergechangelogs4# We need ${BASEDIR}/scripts for our local dpkg-mergechangelogs
5export PATH=${BASEDIR}/scripts:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin5export PATH=${BASEDIR}/scripts:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
6# 1) 'scripts' contains the udd library.6# * If a local bzr is installed, use it
7# 2) If a local bzr is installed, use it7# * bzr-builddeb requires distro-info
8# 3) bzr-builddeb requires distro-info8export PYTHONPATH=${BASEDIR}/bzr:${BASEDIR}/distro-info/python
9export PYTHONPATH=${BASEDIR}/scripts:${BASEDIR}/bzr:${BASEDIR}/distro-info/python
10NAME=mass-import9NAME=mass-import
11DAEMON=${BASEDIR}/scripts/bin/mass-import10DAEMON=${BASEDIR}/scripts/bin/mass-import
12PIDFILE=${BASEDIR}/mass-import.pid11PIDFILE=${BASEDIR}/mass-import.pid
1312
=== modified file 'fixit.sh'
--- fixit.sh 2011-11-08 13:06:03 +0000
+++ fixit.sh 2012-05-04 07:57:18 +0000
@@ -13,10 +13,9 @@
1313
14export BASEDIR=/srv/package-import.canonical.com/new14export BASEDIR=/srv/package-import.canonical.com/new
15export PATH=${BASEDIR}/scripts/bin:${PATH}15export PATH=${BASEDIR}/scripts/bin:${PATH}
16# 1) 'scripts' contains the udd library.16# * If a local bzr is installed, use it
17# 2) If a local bzr is installed, use it17# * bzr-builddeb requires distro-info
18# 3) bzr-builddeb requires distro-info18export PYTHONPATH=${BASEDIR}/bzr:${BASEDIR}/distro-info/python
19export PYTHONPATH=${BASEDIR}/scripts:${BASEDIR}/bzr:${BASEDIR}/distro-info/python
20export BZR_PLUGIN_PATH=${BASEDIR}/scripts/plugins19export BZR_PLUGIN_PATH=${BASEDIR}/scripts/plugins
21export LANG="en_GB.UTF-8"20export LANG="en_GB.UTF-8"
22export BZR_EMAIL="Package Import Robot <package-import@ubuntu.com>"21export BZR_EMAIL="Package Import Robot <package-import@ubuntu.com>"
2322
=== modified file 'importer.crontab'
--- importer.crontab 2011-11-08 13:06:03 +0000
+++ importer.crontab 2012-05-04 07:57:18 +0000
@@ -1,8 +1,7 @@
1SCRIPTS_DIR=/srv/package-import.canonical.com/new/scripts/bin1SCRIPTS_DIR=/srv/package-import.canonical.com/new/scripts/bin
2# 1) 'scripts' contains the udd library.2# * If a local bzr is installed, use it
3# 2) If a local bzr is installed, use it3# * bzr-builddeb requires distro-info
4# 3) bzr-builddeb requires distro-info4PYTHONPATH=/srv/package-import.canonical.com/new/bzr:/srv/package-import.canonical.com/new/distro-info/python
5PYTHONPATH=/srv/package-import.canonical.com/new/scripts:/srv/package-import.canonical.com/new/bzr:/srv/package-import.canonical.com/new/distro-info/python
6# m h dom mon dow command5# m h dom mon dow command
717 * * * * /usr/bin/python ${SCRIPTS_DIR}/logrotate617 * * * * /usr/bin/python ${SCRIPTS_DIR}/logrotate
8*/5 * * * * /usr/bin/python ${SCRIPTS_DIR}/categorise-failures7*/5 * * * * /usr/bin/python ${SCRIPTS_DIR}/categorise-failures
98
=== modified file 'udd/scripts/analyze_log.py'
--- udd/scripts/analyze_log.py 2011-10-10 11:01:48 +0000
+++ udd/scripts/analyze_log.py 2012-05-04 07:57:18 +0000
@@ -508,12 +508,12 @@
508 self.report_all()508 self.report_all()
509509
510510
511def main(args):511def main():
512 if len(args) != 2:512 if len(sys.argv) != 2:
513 print 'Usage: %s <log file path>'513 print 'Usage: %s <log file path>' % (sys.argv[0],)
514 exit(1)514 exit(1)
515515
516 log_path = args[1]516 log_path = sys.argv[1]
517 if log_path == '-':517 if log_path == '-':
518 f = sys.stdin518 f = sys.stdin
519 else:519 else:
520520
=== modified file 'udd/scripts/logrotate.py'
--- udd/scripts/logrotate.py 2011-12-10 09:12:13 +0000
+++ udd/scripts/logrotate.py 2012-05-04 07:57:18 +0000
@@ -3,6 +3,7 @@
33
4import os4import os
5import subprocess5import subprocess
6import sys
67
7from udd import (8from udd import (
8 icommon,9 icommon,
@@ -42,4 +43,4 @@
42 lrot_state_path = os.path.join(log_dir, 'logrotate.state')43 lrot_state_path = os.path.join(log_dir, 'logrotate.state')
43 retcode = subprocess.call(['/usr/sbin/logrotate', '-s', lrot_state_path,44 retcode = subprocess.call(['/usr/sbin/logrotate', '-s', lrot_state_path,
44 lrot_conf_path])45 lrot_conf_path])
45 return retcode46 sys.exit(retcode)

Subscribers

People subscribed via source and target branches