[Python-modules-commits] r10823 - in packages/python-netaddr/trunk/debian (2 files)

[piotr at users.alioth.debian.org]

    Date: Friday, December 18, 2009 @ 19:43:41
  Author: piotr
Revision: 10823

CDBS uses site-packages even for python2.6, adjust runtests.py
accordingly

Modified:
  packages/python-netaddr/trunk/debian/changelog
  packages/python-netaddr/trunk/debian/runtests.py

Modified: packages/python-netaddr/trunk/debian/changelog
===================================================================
--- packages/python-netaddr/trunk/debian/changelog	2009-12-18 13:41:17 UTC (rev 10822)
+++ packages/python-netaddr/trunk/debian/changelog	2009-12-18 19:43:41 UTC (rev 10823)
@@ -1,3 +1,10 @@
+python-netaddr (0.7.3-2) UNRELEASED; urgency=low
+
+  * CDBS uses site-packages even for python2.6, adjust runtests.py
+    accordingly
+
+ -- Piotr Ożarowski <piotr at debian.org>  Fri, 18 Dec 2009 20:41:22 +0100
+
 python-netaddr (0.7.3-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/python-netaddr/trunk/debian/runtests.py
===================================================================
--- packages/python-netaddr/trunk/debian/runtests.py	2009-12-18 13:41:17 UTC (rev 10822)
+++ packages/python-netaddr/trunk/debian/runtests.py	2009-12-18 19:43:41 UTC (rev 10823)
@@ -1,5 +1,5 @@
 import sys
-from os.path import join
+from os.path import join, isdir
 from distutils.sysconfig import get_python_lib
 from site import addsitedir
 
@@ -8,7 +8,10 @@
 
 _path = sys.path[:]
 sys.path[:] = []
-addsitedir(join(root, site_packages[1:]))
+path = join(root, site_packages[1:])
+if not isdir(path):
+    path = join(root, site_packages.replace('/dist', '/site')[1:])
+addsitedir(path)
 sys.path.extend(_path)
 
 import unittest