1
=== modified file 'Makefile'
2
--- Makefile	2010-02-17 17:11:16 +0000
3
+++ Makefile	2011-04-15 01:53:25 +0000
4
@@ -39,7 +39,7 @@
5
39
check: docs check-nodocs
39
check: docs check-nodocs
6
40
40
7
41
check-nodocs: extensions
41
check-nodocs: extensions
9
42
	$(PYTHON) -Werror -O ./bzr selftest -1v $(tests)
42
	$(PYTHON) -Werror -Wignore::ImportWarning -O ./bzr selftest -1v $(tests)
10
43
43
11
44
# Run Python style checker (apt-get install pyflakes)
44
# Run Python style checker (apt-get install pyflakes)
12
45
#
45
#
13
46
46
14
=== modified file 'bzrlib/tests/__init__.py'
15
--- bzrlib/tests/__init__.py	2011-04-14 04:04:52 +0000
16
+++ bzrlib/tests/__init__.py	2011-04-15 01:53:25 +0000
17
@@ -4162,7 +4162,7 @@
18
4162
        try:
4162
        try:
19
4163
            self._module = __import__(self.module_name, {}, {}, [''])
4163
            self._module = __import__(self.module_name, {}, {}, [''])
20
4164
            return True
4164
            return True
22
4165
        except (ImportWarning, ImportError):
4165
        except ImportError:
23
4166
            return False
4166
            return False
24
4167
4167
25
4168
    @property
4168
    @property
Status:	Merged
Approved by:	Andrew Bennetts on 2011-04-15
Approved revision:	no longer in the source branch.
Merged at revision:	4877
Proposed branch:	lp:~mbp/bzr/trivial-2.1
Merge into:	lp:bzr/2.1
Diff against target:	25 lines (+2/-2) 2 files modified Makefile (+1/-1) bzrlib/tests/__init__.py (+1/-1)
To merge this branch:	bzr merge lp:~mbp/bzr/trivial-2.1
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Andrew Bennetts		2011-04-15	Approve on 2011-04-15
Review via email: mp+57802@code.launchpad.net
1	=== modified file 'Makefile'
2	--- Makefile 2010-02-17 17:11:16 +0000
3	+++ Makefile 2011-04-15 01:53:25 +0000
4	@@ -39,7 +39,7 @@
5	39	check: docs check-nodocs	39	check: docs check-nodocs
6	40		40
7	41	check-nodocs: extensions	41	check-nodocs: extensions
9	42	$(PYTHON) -Werror -O ./bzr selftest -1v $(tests)	42	$(PYTHON) -Werror -Wignore::ImportWarning -O ./bzr selftest -1v $(tests)
10	43		43
11	44	# Run Python style checker (apt-get install pyflakes)	44	# Run Python style checker (apt-get install pyflakes)
12	45	#	45	#
13	46		46
14	=== modified file 'bzrlib/tests/__init__.py'
15	--- bzrlib/tests/__init__.py 2011-04-14 04:04:52 +0000
16	+++ bzrlib/tests/__init__.py 2011-04-15 01:53:25 +0000
17	@@ -4162,7 +4162,7 @@
18	4162	try:	4162	try:
19	4163	self._module = __import__(self.module_name, {}, {}, [''])	4163	self._module = __import__(self.module_name, {}, {}, [''])
20	4164	return True	4164	return True
22	4165	except (ImportWarning, ImportError):	4165	except ImportError:
23	4166	return False	4166	return False
24	4167		4167
25	4168	@property	4168	@property