summaryrefslogtreecommitdiff
blob: 3aad32593b3c30c079e67443d8e19a269afd465e (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
Description: Follow up to 80_fix-pickle.patch.  Just disable pickling
 altogether since the previous patch doesn't really fix the problem, and not
 storing the pickle seems to have no adverse effects on the build, while
 avoiding the observed traceback.
Author: Barry Warsaw <barry@debian.org>
Forwarded: no

--- a/waflib/Build.py
+++ b/waflib/Build.py
@@ -151,6 +151,7 @@
 				f.close()
 		self.init_dirs()
 	def store(self):
+		return
 		data={}
 		for x in SAVED_ATTRS:
 			data[x]=getattr(self,x)
--- a/waflib/Context.py
+++ b/waflib/Context.py
@@ -51,8 +51,6 @@
 		global classes
 		classes.insert(0,cls)
 ctx=store_context('ctx',(object,),{})
-class node_class(waflib.Node.Node):
-    pass
 class Context(ctx):
 	errors=Errors
 	tools={}
@@ -62,6 +60,8 @@
 		except KeyError:
 			global run_dir
 			rd=run_dir
+		class node_class(waflib.Node.Node):
+			pass
 		self.node_class=node_class
 		self.node_class.__module__="waflib.Node"
 		self.node_class.__name__="Nod3"