aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-12-05 19:35:19 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-12-05 19:35:19 +0000
commitd2cee7828c9eeaa100e0cffcff33e5955b700f13 (patch)
treea23f6cffb58b6d97d4ff2d6e6be44fbcca26db82
parente599d8d197ba5ca7fd5ef3a7dd63f9d174c2ec3d (diff)
downloadruby-d2cee7828c9eeaa100e0cffcff33e5955b700f13.tar.gz
* lib/pp.rb (File::Stat#pritty_print): some platforms (such as Windows)
does not have major/minor parts of device. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48719 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/pp.rb6
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 24e68c3509..b96bdfecff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec 6 04:33:52 2014 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * lib/pp.rb (File::Stat#pritty_print): some platforms (such as Windows)
+ does not have major/minor parts of device.
+
Fri Dec 5 22:43:04 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* ext/psych/lib/psych.rb: bump version to 2.0.8
diff --git a/lib/pp.rb b/lib/pp.rb
index 0091ddf74c..3c73463c9c 100644
--- a/lib/pp.rb
+++ b/lib/pp.rb
@@ -469,8 +469,10 @@ class File < IO # :nodoc:
q.comma_breakable
q.group {
q.text sprintf("rdev=0x%x", self.rdev)
- q.breakable
- q.text sprintf('(%d, %d)', self.rdev_major, self.rdev_minor)
+ if self.rdev_major && self.rdev_minor
+ q.breakable
+ q.text sprintf('(%d, %d)', self.rdev_major, self.rdev_minor)
+ end
}
q.comma_breakable
q.text "size="; q.pp self.size; q.comma_breakable