fixes to install, transfer, modules

cgi-bin/core/doctype/doctype/doctype.py

@@ -73,7 +73,7 @@ class DocType:
 		self.validate_fields()
 		self.set_version()
 
-	def on_update(self, from_import=None):
+	def on_update(self):
 		# make schma changes
 		from webnotes.model.db_schema import updatedb
 		updatedb(self.doc.name)
@@ -81,7 +81,9 @@ class DocType:
 		self.change_modified_of_parent()
 		
 		import webnotes.defs
-		if (not from_import) and hasattr(webnotes.defs, 'developer_mode') and webnotes.defs.developer_mode:
+		from webnotes.utils.transfer import in_transfer
+
+		if (not in_transfer) and getattr(defs,'developer_mode', 0):
 			self.export_doc()
 		sql("delete from __DocTypeCache")
 		

cgi-bin/core/doctype/module_def/module_def.py

@@ -44,7 +44,9 @@ class DocType:
 
 	def on_update(self, from_update=0):
 		import webnotes.defs
-		if (not from_update) and hasattr(webnotes.defs, 'developer_mode') and webnotes.defs.developer_mode:
+		from webnotes.utils.transfer import in_transfer
+		
+		if (not in_transfer) and getattr(defs,'developer_mode', 0):
 			from webnotes.modules.export_module import export_to_files
 			export_to_files(record_list=[[self.doc.doctype, self.doc.name]])
 			

cgi-bin/core/doctype/page/page.py

@@ -61,8 +61,8 @@ class DocType:
 			it will write out a .html file
 		"""
 		from webnotes import defs
-		
-		if getattr(defs,'developer_mode', 0):
+		from webnotes.utils.transfer import in_transfer
+		if not in_transfer and getattr(defs,'developer_mode', 0):
 			from webnotes.modules.export_module import export_to_files
 			from webnotes.modules import get_module_path, scrub
 			import os

cgi-bin/webnotes/utils/transfer.py

@@ -14,10 +14,15 @@
 import webnotes
 from webnotes.model.doc import Document
 
+# this variable is a flag that transfer process is on, to the on_update
+# method so that if there are other processes on import, it can do so
+in_transfer = 0
+
 def set_doc(doclist, ovr=0, ignore=1, onupdate=1):
 	"""
 		Wrapper function to sync a record
 	"""
+	global in_transfer
 	dt = doclist[0]['doctype']
 	
 	if webnotes.conn.exists(doclist[0]['doctype'], doclist[0]['name']):	
@@ -33,8 +38,10 @@ def set_doc(doclist, ovr=0, ignore=1, onupdate=1):
 			ud = UpdateDocument(doclist)
 	else:
 		ud = UpdateDocument(doclist)
-		
+	
+	in_transfer = 1
 	ud.sync()
+	in_transfer = 0
 	return '\n'.join(ud.log)
 
 
@@ -269,7 +276,7 @@ class UpdateDocType(UpdateDocumentMerge):
 		from webnotes.model.code import get_server_obj
 		so = get_server_obj(self.doc, self.doclist)
 		if hasattr(so, 'on_update'):
-			so.on_update(from_import=1)
+			so.on_update()
 
 
 class UpdateModuleDef(UpdateDocumentMerge):