From 9b80008e33cb1aa5e2839b3c032b7bfb7d1d6ab7 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" As planned, This reverts commit 1d79787e2e792fb0b5088958fe2cca703e4ea508. Fixes: https://github.com/nodejs/node/issues/5213 --- lib/fs.js | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 deletions(-) diff --git a/lib/fs.js b/lib/fs.js index eb2587296a9295..bbdf28bef5cef5 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, ' +