diff --git a/src/providers/python_controller.js b/src/providers/python_controller.js index bb936667..449d42e1 100644 --- a/src/providers/python_controller.js +++ b/src/providers/python_controller.js @@ -149,6 +149,8 @@ export default class Python_controller { throw new Error('fail invoking pip freeze to fetch all installed dependencies in environment --> ' + err.message) } }).toString(); + //debug + // freezeOutput = "alternative pip freeze output goes here for debugging" let lines = freezeOutput.split(EOL) let depNames = lines.map( line => getDependencyName(line)).join(" ") let pipShowOutput = execSync(`${this.pathToPipBin} show ${depNames}`, err =>{ @@ -157,7 +159,7 @@ export default class Python_controller { } }).toString(); let allPipShowDeps = pipShowOutput.split( EOL +"---" + EOL); - let matchManifestVersions = getCustom("MATCH_MANIFEST_VERSIONS","true"); + let matchManifestVersions = getCustom("MATCH_MANIFEST_VERSIONS","true",this.options); let linesOfRequirements = fs.readFileSync(this.pathToRequirements).toString().split(EOL).filter( (line) => !line.startsWith("#")).map(line => line.trim()) let CachedEnvironmentDeps = {} allPipShowDeps.forEach( (record) => { diff --git a/src/providers/python_pip.js b/src/providers/python_pip.js index 9509bfa3..31c742ac 100644 --- a/src/providers/python_pip.js +++ b/src/providers/python_pip.js @@ -201,7 +201,7 @@ function getSbomForComponentAnalysis(data, opts = {}) { let tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'exhort_')) let tmpRequirementsPath = path.join(tmpDir, 'requirements.txt') fs.writeFileSync(tmpRequirementsPath, data) - let pythonController = new Python_controller(createVirtualPythonEnv === "false",binaries.pip,binaries.python,tmpRequirementsPath) + let pythonController = new Python_controller(createVirtualPythonEnv === "false",binaries.pip,binaries.python,tmpRequirementsPath,opts) let dependencies = pythonController.getDependencies(false); let sbom = new Sbom(); sbom.addRoot(toPurl("root",undefined))