summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-02-25 04:35:12 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-02-25 04:35:12 +0000
commitf1f3e2e0d1b224529132a5ac30562925e251a75d (patch)
treeadb51f82245bdfd9daf80ce7e152a675b8b7fe68
parentcfef93be1e1e4dfcd0cb7a6396e24f47b64095c9 (diff)
downloadruby-f1f3e2e0d1b224529132a5ac30562925e251a75d.tar.gz
ruby-f1f3e2e0d1b224529132a5ac30562925e251a75d.tar.xz
ruby-f1f3e2e0d1b224529132a5ac30562925e251a75d.zip
* lib/shell.rb (Shell::expand_path): relative to @cwd.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/shell.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0c35b13cb..5734fbce2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb 25 13:32:13 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
+
+ * lib/shell.rb (Shell::expand_path): relative to @cwd.
+
Sun Feb 24 17:20:22 2002 Akinori MUSHA <knu@iDaemons.org>
* ext/digest/*/*.h: Merge from rough.
diff --git a/lib/shell.rb b/lib/shell.rb
index bed9c052e..acc4adec0 100644
--- a/lib/shell.rb
+++ b/lib/shell.rb
@@ -116,7 +116,7 @@ class Shell
attr_reader :process_controller
def expand_path(path)
- File.expand_path(path)
+ File.expand_path(path, @cwd)
end
# Most Shell commands are defined via CommandProcessor