summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-03-06 02:41:15 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-03-06 02:41:15 +0000
commit4e852d504f12e7d6f3c758c619e8ca759903ce7d (patch)
tree1dcbe73e2ea751544f783fcc7397451b402a5d76 /lib
parente01a8f2b15d738aba9d23523a9ddbe92ed8da489 (diff)
downloadruby-4e852d504f12e7d6f3c758c619e8ca759903ce7d.tar.gz
ruby-4e852d504f12e7d6f3c758c619e8ca759903ce7d.tar.xz
ruby-4e852d504f12e7d6f3c758c619e8ca759903ce7d.zip
* lib/pp.rb (File::Stat#pretty_print): Etc.getpwuid and Etc.getgrgid
may return nil. [ruby-talk:129826] reported by Daniel Berger. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@8083 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/pp.rb12
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/pp.rb b/lib/pp.rb
index 756dce6f5..7cbbd8a0c 100644
--- a/lib/pp.rb
+++ b/lib/pp.rb
@@ -407,19 +407,23 @@ class File
q.group {
q.text "uid="; q.pp self.uid
begin
- name = Etc.getpwuid(self.uid).name
- q.breakable; q.text "(#{name})"
+ pw = Etc.getpwuid(self.uid)
rescue ArgumentError
end
+ if pw
+ q.breakable; q.text "(#{pw.name})"
+ end
}
q.comma_breakable
q.group {
q.text "gid="; q.pp self.gid
begin
- name = Etc.getgrgid(self.gid).name
- q.breakable; q.text "(#{name})"
+ gr = Etc.getgrgid(self.gid)
rescue ArgumentError
end
+ if gr
+ q.breakable; q.text "(#{gr.name})"
+ end
}
q.comma_breakable
q.group {