diff options
-rw-r--r-- | lib/fileutils.rb | 1 | ||||
-rw-r--r-- | lib/un.rb | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/fileutils.rb b/lib/fileutils.rb index 74cb4a3e0c..4317af5327 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -812,7 +812,6 @@ module FileUtils private_module_function :apply_mask def symbolic_modes_to_i(mode_sym, path) #:nodoc: - return mode_sym.oct if /\A[0-7]+\z/ =~ mode_sym mode = if File::Stat === path path.mode else @@ -196,7 +196,7 @@ end def install setup("pm:o:g:") do |argv, options| - (mode = options.delete :m) and options[:mode] = mode + (mode = options.delete :m) and options[:mode] = /\A\d/ =~ mode ? mode.oct : mode options[:preserve] = true if options.delete :p (owner = options.delete :o) and options[:owner] = owner (group = options.delete :g) and options[:group] = group @@ -216,7 +216,8 @@ end def chmod setup do |argv, options| - mode = argv.shift.oct + mode = argv.shift + mode = /\A\d/ =~ mode ? mode.oct : mode FileUtils.chmod mode, argv, options end end |