Merge pull request #1713 from xzyfer/fix/context

Fix regressions in context refactor
sass · Nov 11, 2015 · f47645c · f47645c
2 parents 49077ea + 949fc98
commit f47645c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/context.cpp b/src/context.cpp
@@ -259,11 +259,11 @@ namespace Sass {
 
     // do not parse same resource twice
     // maybe raise an error in this case
-    if (sheets.count(inc.abs_path)) {
-      free(res.contents); free(res.srcmap);
-      throw std::runtime_error("duplicate resource registered");
-      return;
-    }
+    // if (sheets.count(inc.abs_path)) {
+    //   free(res.contents); free(res.srcmap);
+    //   throw std::runtime_error("duplicate resource registered");
+    //   return;
+    // }
 
     // get index for this resource
     size_t idx = resources.size();
@@ -276,7 +276,7 @@ namespace Sass {
     resources.push_back(res);
 
     // add a relative link to the working directory
-    included_files.push_back(abs2rel(inc.abs_path, CWD));
+    included_files.push_back(inc.abs_path);
     // add a relative link  to the source map output file
     srcmap_links.push_back(abs2rel(inc.abs_path, source_map_file, CWD));
 

diff --git a/src/output.cpp b/src/output.cpp
@@ -135,8 +135,7 @@ namespace Sass {
       if (ctx && ctx->c_options->source_comments) {
         std::stringstream ss;
         append_indentation();
-        std::string path = Sass::File::abs2rel(r->pstate().path, ctx->cwd());
-        ss << "/* line " << r->pstate().line + 1 << ", " << path << " */";
+        ss << "/* line " << r->pstate().line + 1 << ", " << r->pstate().path << " */";
         append_string(ss.str());
         append_optional_linefeed();
       }