Pass in resourcePath and devMode to Package.loadMetadata

Esse commit está contido em:
Kevin Sawicki
2014-11-07 13:07:21 -08:00
commit 587b73e3b9
2 arquivos alterados com 8 adições e 8 exclusões
+2 -2
Ver Arquivo
@@ -228,7 +228,7 @@ class PackageManager
packages = []
for packagePath in @getAvailablePackagePaths()
name = path.basename(packagePath)
metadata = @getLoadedPackage(name)?.metadata ? Package.loadMetadata(packagePath, true)
metadata = @getLoadedPackage(name)?.metadata ? Package.loadMetadata(packagePath, {ignoreErrors: true, @resourcePath, @devMode})
packages.push(metadata)
packages
@@ -252,7 +252,7 @@ class PackageManager
@packageDependencies
hasAtomEngine: (packagePath) ->
metadata = Package.loadMetadata(packagePath, true)
metadata = Package.loadMetadata(packagePath, ignoreErrors: true)
metadata?.engines?.atom?
unobserveDisabledPackages: ->
+6 -6
Ver Arquivo
@@ -26,16 +26,16 @@ class Package
@stylesheetsDir: 'stylesheets'
@isBundledPackagePath: (packagePath) ->
if atom.packages.devMode
return false unless atom.packages.resourcePath.startsWith("#{process.resourcesPath}#{path.sep}")
@isBundledPackagePath: (packagePath, resourcePath, devMode) ->
if devMode
return false unless resourcePath.startsWith("#{process.resourcesPath}#{path.sep}")
@resourcePathWithTrailingSlash ?= "#{atom.packages.resourcePath}#{path.sep}"
@resourcePathWithTrailingSlash ?= "#{resourcePath}#{path.sep}"
packagePath?.startsWith(@resourcePathWithTrailingSlash)
@loadMetadata: (packagePath, ignoreErrors=false) ->
@loadMetadata: (packagePath, {ignoreErrors, devMode, resourcePath}={}) ->
packageName = path.basename(packagePath)
if @isBundledPackagePath(packagePath)
if @isBundledPackagePath(packagePath, resourcePath, devMode)
metadata = packagesCache[packageName]?.metadata
unless metadata?
if metadataPath = CSON.resolve(path.join(packagePath, 'package'))