diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-03-06 19:54:59 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-03-06 19:54:59 +0000 |
| commit | 0549d0393be2822359aa2392fabae1d7b23bca25 (patch) | |
| tree | e5119d56e8d784b15eab572602d4ff547920b431 | |
| parent | 72d747b47d4306bfccf37d45a619450ec6899317 (diff) | |
Making some logging changes, and fixing a small bug in group management on missing files
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@988 980ebf18-57e1-0310-9a29-db15c13687c0
| -rwxr-xr-x | lib/puppet/server/fileserver.rb | 3 | ||||
| -rw-r--r-- | lib/puppet/type/package.rb | 2 | ||||
| -rwxr-xr-x | lib/puppet/type/pfile/group.rb | 12 |
3 files changed, 7 insertions, 10 deletions
diff --git a/lib/puppet/server/fileserver.rb b/lib/puppet/server/fileserver.rb index 5b27f2fcb..24bd50ec3 100755 --- a/lib/puppet/server/fileserver.rb +++ b/lib/puppet/server/fileserver.rb @@ -69,7 +69,7 @@ class Server CHECKPARAMS.each { |check| if state = obj.state(check) unless state.is - mount.notice "Manually retrieving info for %s" % check + mount.debug "Manually retrieving info for %s" % check state.retrieve end desc << state.is @@ -518,7 +518,6 @@ class Server # This, ah, might be completely redundant unless obj[:links] == links - obj.info "setting links to %s" % links.inspect obj[:links] = links end diff --git a/lib/puppet/type/package.rb b/lib/puppet/type/package.rb index 9cf7902f5..e23732c70 100644 --- a/lib/puppet/type/package.rb +++ b/lib/puppet/type/package.rb @@ -162,8 +162,6 @@ module Puppet if @latest and ((Time.now.to_i - @lateststamp) / 60) < 5 #self.debug "Skipping latest check" else - self.warning "latest: %s, stamp: %s" % - [@latest.inspect, (Time.now.to_i - @lateststamp) / 60] begin @latest = @parent.latest @lateststamp = Time.now.to_i diff --git a/lib/puppet/type/pfile/group.rb b/lib/puppet/type/pfile/group.rb index 7fde3c657..c769a344e 100755 --- a/lib/puppet/type/pfile/group.rb +++ b/lib/puppet/type/pfile/group.rb @@ -40,18 +40,18 @@ module Puppet def retrieve stat = @parent.stat(false) + unless stat + self.is = :absent + return + end + # Set our method appropriately, depending on links. if stat.ftype == "link" and @parent[:links] != :follow @method = :lchown else @method = :chown end - - if stat - self.is = stat.gid - else - self.is = :absent - end + self.is = stat.gid end # Determine if the group is valid, and if so, return the UID |