diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-03-06 02:41:15 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-03-06 02:41:15 +0000 |
commit | 6a3c57bb2a748674dbf22808a0ef413719137e8a (patch) | |
tree | 1dcbe73e2ea751544f783fcc7397451b402a5d76 | |
parent | b63b8f5a87b58c4d6210d8d7b65eed0924463435 (diff) |
* 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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8083 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | lib/pp.rb | 12 |
2 files changed, 14 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Sun Mar 6 11:36:37 2005 Tanaka Akira <akr@m17n.org> + + * lib/pp.rb (File::Stat#pretty_print): Etc.getpwuid and Etc.getgrgid + may return nil. [ruby-talk:129826] + reported by Daniel Berger. + Sat Mar 5 18:06:21 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> * dir.c (fnmatch): removed unnecessary code. (ruby_1_8 didn't have @@ -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 { |