Merge lp:~barry/python-distutils-extra/670188-ftbfs into lp:python-distutils-extra

Proposed by Barry Warsaw on 2010-11-04
Status: Merged
Merged at revision: 223
Proposed branch: lp:~barry/python-distutils-extra/670188-ftbfs
Merge into: lp:python-distutils-extra
Diff against target: 64 lines (+15/-5)
3 files modified
debian/changelog (+8/-0)
setup.py (+1/-1)
test/auto.py (+6/-4)
To merge this branch: bzr merge lp:~barry/python-distutils-extra/670188-ftbfs
Reviewer Review Type Date Requested Status
Registry Administrators 2010-11-04 Pending
Review via email: mp+40136@code.launchpad.net

Description of the change

Let's try this again, this time against the upstream branch!

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-11-04 02:37:33 +0000
3+++ debian/changelog 2010-11-04 18:44:43 +0000
4@@ -1,3 +1,11 @@
5+python-distutils-extra (2.22-4) unstable; urgency=low
6+
7+ * When the environment has $PYTHONPATH in it, we still need to prepend
8+ oldcwd in test/auto.py, so that the DistUtilsExtra package can be
9+ found. (LP: #670188)
10+
11+ -- Barry Warsaw <barry@ubuntu.com> Thu, 04 Nov 2010 14:33:04 -0400
12+
13 python-distutils-extra (2.22-3) unstable; urgency=low
14
15 [ Martin Pitt ]
16
17=== modified file 'setup.py'
18--- setup.py 2010-09-16 12:06:26 +0000
19+++ setup.py 2010-11-04 18:44:43 +0000
20@@ -1,7 +1,7 @@
21 #!/usr/bin/env python
22
23 from setuptools import setup
24-import glob, os, sys
25+import sys
26
27 sys.path.insert(0, '.')
28 from DistUtilsExtra import __version__ as pkgversion
29
30=== modified file 'test/auto.py'
31--- test/auto.py 2010-10-01 16:03:27 +0000
32+++ test/auto.py 2010-11-04 18:44:43 +0000
33@@ -2,7 +2,7 @@
34
35 # test DistUtilsExtra.auto
36
37-import sys, unittest, shutil, tempfile, os, os.path, subprocess, re
38+import unittest, shutil, tempfile, os, os.path, subprocess, re
39
40 class T(unittest.TestCase):
41 def setUp(self):
42@@ -32,7 +32,7 @@
43 try:
44 # check that setup.py clean removes everything
45 (o, e, s) = self.setup_py(['clean', '-a'])
46- self.assertEqual(s, 0)
47+ self.assertEqual(s, 0, o+e)
48 cruft = self.diff_snapshot()
49 self.assertEqual(cruft, '', 'no cruft after cleaning:\n' + cruft)
50 finally:
51@@ -759,9 +759,11 @@
52 if not self.snapshot:
53 self.do_snapshot()
54
55- env = os.environ
56+ env = os.environ.copy()
57 oldcwd = os.getcwd()
58- if 'PYTHONPATH' not in env:
59+ if 'PYTHONPATH' in env:
60+ env['PYTHONPATH'] = oldcwd + os.pathsep + env['PYTHONPATH']
61+ else:
62 env['PYTHONPATH'] = oldcwd
63 os.chdir(self.src)
64 s = subprocess.Popen(['/proc/self/exe', 'setup.py'] + args, env=env,

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: