[Demi-commits] r69 - lib

[John Morrissey]

Author: jwm-guest
Date: 2006-01-30 19:19:15 +0000 (Mon, 30 Jan 2006)
New Revision: 69

Modified:
   lib/remotecommand.py
Log:
avoid a circular dependency


Modified: lib/remotecommand.py
===================================================================
--- lib/remotecommand.py	2006-01-30 18:05:18 UTC (rev 68)
+++ lib/remotecommand.py	2006-01-30 19:19:15 UTC (rev 69)
@@ -22,7 +22,7 @@
 from tempfile import mkstemp
 from time     import time
 
-import demi, machine
+import demi
 from command import Command, CommandExecFailure
 
 class RemoteCommand(Command):
@@ -84,6 +84,8 @@
 		if not re.match("^[a-z0-9\.-]+$", self.id):
 			raise Exception("Invalid command ID: '%s'." % (self.id))
 
+		# Avoid a circular dependency.
+		import machine
 		m = machine.Machine(id = self.mid)
 
  		(fd, file) = mkstemp(prefix = "demi")