Merge lp:~elachuni/ubuntu-webcatalog/python2.7 into lp:ubuntu-webcatalog

[Anthony Lenton]

This branch has a fix to the bootstrap fabric task, so that it supports natty's system library layout (using python2.7) as well as maverick's python 2.6.

[Michael Nelson (michael.nelson)]

Thanks Anthony, although it looks like sys.version_info is a tuple in 2.6 :/

michael@devmav:~/isd/webcat/review$ fab symlink_python_apt
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/fabric/main.py", line 424, in main
    commands[name](*args, **kwargs)
  File "/home/michael/isd/webcat/review/fabtasks/bootstrap.py", line 37, in symlink_python_apt
    system_libdir = '/usr/lib/python2.%s/' % sys.version_info.minor
AttributeError: 'tuple' object has no attribute 'minor'
michael@devmav:~/isd/webcat/review$

In [2]: sys.version_info
Out[2]: (2, 6, 6, 'final', 0)

review: Needs Fixing

[lp:~elachuni/ubuntu-webcatalog/python2.7]

14. By Anthony Lenton on 2011-05-06

Updated bootstrap fabtask to get minor version from a tuple.

=== modified file 'fabtasks/bootstrap.py'
--- fabtasks/bootstrap.py	2011-04-11 09:28:12 +0000
+++ fabtasks/bootstrap.py	2011-05-06 21:01:45 +0000
@@ -17,6 +17,7 @@
 
 import os
 import os.path
+import sys
 
 from fabric.api import local
 
@@ -33,15 +34,18 @@
 
 
 def symlink_python_apt():
-    _symlink(
-        '/usr/lib/python2.6/dist-packages/apt/',
-        'virtualenv/lib/python2.6/site-packages/apt')
-    _symlink(
-        '/usr/lib/python2.6/dist-packages/apt_pkg.so',
-        'virtualenv/lib/python2.6/site-packages/apt_pkg.so')
-    _symlink(
-        '/usr/lib/python2.6/dist-packages/apt_inst.so',
-        'virtualenv/lib/python2.6/site-packages/apt_inst.so')
+    version_minor = sys.version_info[1]
+    system_libdir = '/usr/lib/python2.%s/' % version_minor
+    virtualenv_libdir = 'virtualenv/lib/python2.%s/' % version_minor
+    _symlink(
+        system_libdir + 'dist-packages/apt/',
+        virtualenv_libdir + 'site-packages/apt')
+    _symlink(
+        system_libdir + 'dist-packages/apt_pkg.so',
+        virtualenv_libdir + 'site-packages/apt_pkg.so')
+    _symlink(
+        system_libdir + 'dist-packages/apt_inst.so',
+        virtualenv_libdir + 'site-packages/apt_inst.so')
 
 
 def _symlink(source, link_name):