From 49ef3ae90af7433b0ff29eb8519ae3bd6c9d58dd Mon Sep 17 00:00:00 2001 From: James M Snell Date: Tue, 26 Apr 2016 22:25:37 -0700 Subject: [PATCH] Revert "fs: add a temporary fix for re-evaluation support" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As planned, This reverts commit 1d79787e2e792fb0b5088958fe2cca703e4ea508. Fixes: https://github.com/nodejs/node/issues/5213 PR-URL: https://github.com/nodejs/node/pull/6413 Reviewed-By: Ben Noordhuis Reviewed-By: Сковорода Никита Андреевич Reviewed-By: JungMinu - Minwoo Jung Reviewed-By: Rod Vagg Reviewed-By: Sakthipriyan Vairamani Reviewed-By: Myles Borins Reviewed-By: Colin Ihrig --- lib/fs.js | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 deletions(-) diff --git a/lib/fs.js b/lib/fs.js index d07116a9ea9812..a7e8a395a68017 100644 --- a/lib/fs.js +++ b/lib/fs.js @@ -40,42 +40,7 @@ const isWindows = process.platform === 'win32'; const DEBUG = process.env.NODE_DEBUG && /fs/.test(process.env.NODE_DEBUG); const errnoException = util._errnoException; - -var printDeprecation; -try { - printDeprecation = require('internal/util').printDeprecationMessage; -} catch (e) { - if (e.code !== 'MODULE_NOT_FOUND') throw e; - - // TODO(ChALkeR): remove this in master after 6.x - // This code was based upon internal/util and is required to give users - // a grace period before actually breaking modules that re-evaluate fs - // sources from context where internal modules are not allowed, e.g. - // older versions of graceful-fs module. - - const prefix = `(${process.release.name}:${process.pid}) `; - - printDeprecation = function(msg, warned) { - if (process.noDeprecation) - return true; - - if (warned) - return warned; - - if (process.throwDeprecation) - throw new Error(`${prefix}${msg}`); - else if (process.traceDeprecation) - console.trace(msg); - else - console.error(`${prefix}${msg}`); - - return true; - }; - printDeprecation('fs: re-evaluating native module sources is not ' + - 'supported. If you are using the graceful-fs module, ' + - 'please update it to a more recent version.', - false); -} +const printDeprecation = require('internal/util').printDeprecationMessage; function throwOptionsError(options) { throw new TypeError('Expected options to be either an object or a string, ' +