Skip to content

Commit

Permalink
Fix a Windows path canonicalization bug.
Browse files Browse the repository at this point in the history
  • Loading branch information
nex3 committed Mar 21, 2014
1 parent dba9745 commit 9b10d43
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
3 changes: 3 additions & 0 deletions doc-src/SASS_CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@

* Fix the use of directives like `@font-face` within `@at-root`.

* Fix a `sass --watch` issue on Windows where too many files would be updated
on every change.

* Avoid freezing Ruby's `nil` value.

## 3.3.3 (14 March 2014)
Expand Down
3 changes: 2 additions & 1 deletion lib/sass/importers/filesystem.rb
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,9 @@ def escape_glob_characters(name)
# @param name [String] The filename to search for.
# @return [(String, Symbol)] A filename-syntax pair.
def find_real_file(dir, name, options)
# on windows 'dir' can be in native File::ALT_SEPARATOR form
# On windows 'dir' or 'name' can be in native File::ALT_SEPARATOR form.
dir = dir.gsub(File::ALT_SEPARATOR, File::SEPARATOR) unless File::ALT_SEPARATOR.nil?
name = name.gsub(File::ALT_SEPARATOR, File::SEPARATOR) unless File::ALT_SEPARATOR.nil?

found = possible_files(remove_root(name)).map do |f, s|
path = (dir == "." || Sass::Util.pathname(f).absolute?) ? f :
Expand Down

0 comments on commit 9b10d43

Please sign in to comment.