Changeset 28 for trunk/change.py

Timestamp:

26/11/07 20:14:17 (4 years ago)

Author:

daedalus

Message:

* Refactored code to permit more flexible templating of changes. You can now

define a <changetemplate/> in 95% the same way as a <change/>, and then
refer to a <changetemplate/> when defining a <change/> to allow you to
combine change templates as a change flow, using namespaces and iterators
for each one.

* Some work on manual bailout in authoritarian mode, but it isn't completely

bailing out immediately yet, due to some complexities in the deferred chains
that I haven't quite unravelled.

Files:

• trunk/change.py (modified) (2 diffs)

trunk/change.py

@@ -215 +215 @@
         return '<%s: %s>' % ( self.__class__, self.name )
 
+    def copy(self):
+        """
+        Create a copy of myself.
+        """
+        newchange = CommandChange('Copy of %s' % self.name,
+                                  self.devices,
+                                  self.serial_mode,
+                                  self.backout_all,
+                                  self.on_fail_continue,
+                                  self.on_fail_retry,
+                                  self.max_retries,
+                                  self.pre_impl,
+                                  self.impl,
+                                  self.post_impl,
+                                  self.pre_backout,
+                                  self.backoutset,
+                                  self.post_backout,
+                                  self.pre_requisites,
+                                  )
+
+        # set the namespace as a copy of mine
+        if self.namespace is not None:
+            newchange.namespace = self.namespace.copy()
+            pass
+
+        return newchange
+        
     def set_state(self, state_string):
         self.state = CHANGE_STATE[state_string]
@@ -236 +263 @@
                 for ns in self.iterator:
                     log.debug("Adding namespace entry of: %s", ns)
-                    # FIXME: This permanently updates the namespace.
-                    # Should we be updating a local copy?
+
+                    # Make sure we only update a copy, so that this
+                    # update isn't permanent
                     newnamespace = ns.copy()
                     newnamespace.update(namespace)