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

[Max Bowsher]

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.

[James Westby (james-w)]

review: Approve

=== 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 @@
+import os
+import sys
+
+udd_scripts_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+# scripts branch root contains the udd library
+sys.path.insert(0, udd_scripts_root)

=== 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 @@
 #!/usr/bin/python
-
+import _path
 from udd.scripts.add_import_jobs import main
-
-
 main()

=== 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 @@
 #!/usr/bin/python
 """Analyzes the package importer log files collecting various historical data.
 """
-
-import sys
-
+import _path
 from udd.scripts.analyze_log import main
-
-
-if __name__ == '__main__':
-    main(sys.argv)
+main()

=== 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 @@
 #!/usr/bin/python
 # Script to create local branches from all existing official package branches
 # of a package, for debugging purposes.
-
+import _path
 from udd.scripts.branch_branches_from_lp import main
-
-
-if __name__ == '__main__':
-    main()
+main()

=== 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 @@
 #!/usr/bin/python
-
+import _path
 from udd.scripts.categorise_failures import main
-
-
-if __name__ == '__main__':
-    main()
+main()

=== 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 @@
 #!/usr/bin/python
-
+import _path
 from udd.scripts.count_outstanding_jobs import main
-
-
-if __name__ == '__main__':
-    main()
+main()

=== 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 @@
 #!/usr/bin/python
-
+import _path
 from udd.scripts.delete_branches_from_lp import main
-
-
-if __name__ == '__main__':
-    main()
+main()

=== 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 @@
 #!/usr/bin/python
-
+import _path
 from udd.scripts.email_failures import main
-
-
-if __name__ == '__main__':
-    main()
+main()

=== 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 @@
 #!/usr/bin/python
-
+import _path
 from udd.scripts.graph_failures import main
-
-
-if __name__ == '__main__':
-    main()
+main()

=== 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 @@
 #!/usr/bin/python
-
+import _path
 from udd.scripts.import_package import main
-
-
-if __name__ == '__main__':
-    main()
-
+main()

=== 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 @@
 #!/usr/bin/python
-
 """Get a list of packages from Launchpad and store them in the local database."""
-
+import _path
 from udd.scripts.list_packages import main
-
-
-if __name__ == '__main__':
-    main()
+main()

=== 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 @@
 #!/usr/bin/python
 """Invoke logrotate for the package importer taking configuration into account.
 """
-
-import sys
-
+import _path
 from udd.scripts.logrotate import main
-
-
-if __name__ == '__main__':
-    sys.exit(main())
+main()

=== 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 @@
 #!/usr/bin/python
-
+import _path
 from udd.scripts.mass_import import main
-
-
-if __name__ == '__main__':
-    main()
+main()

=== 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 @@
 #!/usr/bin/python
-
+import _path
 from udd.scripts.requeue_package import main
-
-
-if __name__ == '__main__':
-    main()
+main()

=== 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 @@
 #!/usr/bin/python
-
+import _path
 from udd.scripts.set_official import main
-
-
-if __name__ == '__main__':
-    main()
+main()

=== 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 @@
 #!/usr/bin/python
-
+import _path
 from udd.scripts.show_failure import main
-
-
-if __name__ == '__main__':
-    main()
+main()

=== 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 @@
 export BASEDIR=/srv/package-import.canonical.com/new
 # We need ${BASEDIR}/scripts for our local dpkg-mergechangelogs
 export PATH=${BASEDIR}/scripts:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-# 1) 'scripts' contains the udd library.
-# 2) If a local bzr is installed, use it
-# 3) bzr-builddeb requires distro-info
-export PYTHONPATH=${BASEDIR}/scripts:${BASEDIR}/bzr:${BASEDIR}/distro-info/python
+# * If a local bzr is installed, use it
+# * bzr-builddeb requires distro-info
+export PYTHONPATH=${BASEDIR}/bzr:${BASEDIR}/distro-info/python
 NAME=mass-import
 DAEMON=${BASEDIR}/scripts/bin/mass-import
 PIDFILE=${BASEDIR}/mass-import.pid

=== 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 @@
 
 export BASEDIR=/srv/package-import.canonical.com/new
 export PATH=${BASEDIR}/scripts/bin:${PATH}
-# 1) 'scripts' contains the udd library.
-# 2) If a local bzr is installed, use it
-# 3) bzr-builddeb requires distro-info
-export PYTHONPATH=${BASEDIR}/scripts:${BASEDIR}/bzr:${BASEDIR}/distro-info/python
+# * If a local bzr is installed, use it
+# * bzr-builddeb requires distro-info
+export PYTHONPATH=${BASEDIR}/bzr:${BASEDIR}/distro-info/python
 export BZR_PLUGIN_PATH=${BASEDIR}/scripts/plugins
 export LANG="en_GB.UTF-8"
 export BZR_EMAIL="Package Import Robot <[e-mail]>"

=== 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 @@
 SCRIPTS_DIR=/srv/package-import.canonical.com/new/scripts/bin
-# 1) 'scripts' contains the udd library.
-# 2) If a local bzr is installed, use it
-# 3) bzr-builddeb requires distro-info
-PYTHONPATH=/srv/package-import.canonical.com/new/scripts:/srv/package-import.canonical.com/new/bzr:/srv/package-import.canonical.com/new/distro-info/python
+# * If a local bzr is installed, use it
+# * bzr-builddeb requires distro-info
+PYTHONPATH=/srv/package-import.canonical.com/new/bzr:/srv/package-import.canonical.com/new/distro-info/python
 # m h  dom mon dow   command
 17 * * * * /usr/bin/python ${SCRIPTS_DIR}/logrotate
 */5 * * * * /usr/bin/python ${SCRIPTS_DIR}/categorise-failures

=== 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 @@
         self.report_all()
 
 
-def main(args):
-    if len(args) != 2:
-        print 'Usage: %s <log file path>'
+def main():
+    if len(sys.argv) != 2:
+        print 'Usage: %s <log file path>' % (sys.argv[0],)
         exit(1)
 
-    log_path = args[1]
+    log_path = sys.argv[1]
     if log_path == '-':
         f = sys.stdin
     else:

=== 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 @@
 
 import os
 import subprocess
+import sys
 
 from udd import (
     icommon,
@@ -42,4 +43,4 @@
     lrot_state_path = os.path.join(log_dir, 'logrotate.state')
     retcode = subprocess.call(['/usr/sbin/logrotate', '-s', lrot_state_path,
                                lrot_conf_path])
-    return retcode
+    sys.exit(retcode)