diff options
| author | Casey Dahlin <cdahlin@redhat.com> | 2009-01-04 09:24:51 -0500 |
|---|---|---|
| committer | Casey Dahlin <cdahlin@redhat.com> | 2009-01-04 09:24:51 -0500 |
| commit | 203220d26d3b17b5f7aaedc40c11bd2c13e03575 (patch) | |
| tree | 4899bb99fe9b4f6485d4fd2e1fb840f7b2204dd8 /statemachine.py | |
| parent | 1b3d3649d5375a324ee62e34abd95fc8ce1205cb (diff) | |
| download | upstate-203220d26d3b17b5f7aaedc40c11bd2c13e03575.tar.gz upstate-203220d26d3b17b5f7aaedc40c11bd2c13e03575.tar.xz upstate-203220d26d3b17b5f7aaedc40c11bd2c13e03575.zip | |
Don't need to be so explicit when bringing states up
You can now omit a lot of the "any"s and still get what you expect
Diffstat (limited to 'statemachine.py')
| -rw-r--r-- | statemachine.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/statemachine.py b/statemachine.py index 772eee1..b56dca9 100644 --- a/statemachine.py +++ b/statemachine.py @@ -91,7 +91,7 @@ class StateMachine: retval = [] for cat in self.up: if dependencies.superset_of(cat): - retval.append(dependents.fill(cat.args)) + retval.append(dependents.intersect(Category(dependents.name, **cat.args))) return set(retval) | dependents.inverse_set() def get_applicable_deps(self, cat): @@ -125,7 +125,7 @@ if __name__ == "__main__": sm.bring_up(Category("vol_conf", uuid=any(), devname=m("foosrv.com:/vol/home"), label=any(), type=m("nfs"), mountpoint=m("/home"))) sm.bring_up(Category("vol_conf", uuid=any(), devname=m("foosrv.com:/vol/beefs"), label=any(), type=m("nfs"), mountpoint=m("/beefs"))) sm.bring_up(Category("found_disk", uuid=m("d3adb3ef"), devname=m("/dev/sda"), label=m("myroot"))) - sm.bring_up(Category("mounted", uuid=any(), type=any(), devname=any(), label=any(), mountpoint=any())) + sm.bring_up(Category("mounted", devname=any(), mountpoint=any())) print sm print "--" sm.bring_down(Category("network_up")) |