diff options
author | Luke Kanies <luke@madstop.com> | 2007-09-17 15:21:44 -0700 |
---|---|---|
committer | Luke Kanies <luke@madstop.com> | 2007-09-17 15:21:44 -0700 |
commit | 9fa2628a844c75b8f554f283dfece01667f20594 (patch) | |
tree | 7c1b57c56879b2b083063895bae6423f2b94dc9c /ext | |
parent | b3c8cdb67d9a423a1d14764f1e58f677d7ef8d41 (diff) | |
download | puppet-9fa2628a844c75b8f554f283dfece01667f20594.tar.gz puppet-9fa2628a844c75b8f554f283dfece01667f20594.tar.xz puppet-9fa2628a844c75b8f554f283dfece01667f20594.zip |
This is basically another intermediate commit. I feel like
I've gone too far down the rabbit hole to turn back now, but the
code is clearly getting more centralized around the Configuration
class, which is the goal.
Things are currently a bit muddy between recursion, dynamic resource
generation, transactions, and the configuration, and I don't expect
to be able to clear it up much until we rewrite all of the tests
for the Transaction class, since that is when we'll actually be
setting its behaviour.
At this point, Files (which are currently the only resources that
generate other resources) are responsible for adding their edges
to the relationship graph. This puts them knowing more than I would
like about how the relationship graph works, but it'll have to do for now.
There are still failing tests, but files seem to work again. Now to
go through the rest of the tests and make them work.
Diffstat (limited to 'ext')
-rwxr-xr-x | ext/module_puppet | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/module_puppet b/ext/module_puppet index cb03b6ef2..194f3fa09 100755 --- a/ext/module_puppet +++ b/ext/module_puppet @@ -191,8 +191,8 @@ if parseonly end begin - client.getconfig - client.apply + config = client.getconfig + config.apply rescue => detail Puppet.err detail exit(1) |