Fixing #262. I somehow lost the line that only added a given user's jobs to each tab.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1607 980ebf18-57e1-0310-9a29-db15c13687c0

2 files changed, 5 insertions, 4 deletions

diff --git a/lib/puppet/filetype.rb b/lib/puppet/filetype.rb
index 03bf70838..c70daafb3 100755
--- a/lib/puppet/filetype.rb
+++ b/lib/puppet/filetype.rb
@@ -136,14 +136,14 @@ module Puppet
 
             def path=(user)
                 begin
-                    uid = Puppet::Util.uid(user)
+                    @uid = Puppet::Util.uid(user)
                 rescue Puppet::Error => detail
                     raise Puppet::Error, "Could not retrieve user %s" % user
                 end
 
-                # We have to have the user name, not the uid, because some
+                # XXX We have to have the user name, not the uid, because some
                 # systems *cough*linux*cough* require it that way
-                @path = uid
+                @path = user
             end
 
             # Read a specific @path's cron tab.
@@ -174,7 +174,7 @@ module Puppet
             # does not think I should be allowed to set the @path to my own user name
             def cmdbase
                 cmd = nil
-                if @path == Process.uid
+                if @uid == Process.uid
                     return "crontab"
                 else
                     return "crontab -u #{@path}"
diff --git a/lib/puppet/type/cron.rb b/lib/puppet/type/cron.rb
index 30d88237c..ae12f4adf 100755
--- a/lib/puppet/type/cron.rb
+++ b/lib/puppet/type/cron.rb
@@ -645,6 +645,7 @@ module Puppet
             @tabs[user] ||= @filetype.new(user)
 
             self.each do |inst|
+                next unless inst[:user] == user
                 unless (@instances[user] and @instances[user].include? inst)
                     @instances[user] ||= []
                     @instances[user] << inst