Skip to content

Commit 23e3542

Browse files
committed
Merge pull request mgcrea#14 from lxndr/fix-pkcs12.export
fix(stderr): dont throw error if stderr is empty
2 parents db48a61 + 1f20dd4 commit 23e3542

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

src/index.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,15 @@ export default function exec(action, maybeBuffer, maybeOptions, maybeCallback) {
6767
openssl.on('close', code => {
6868
const stdout = Buffer.concat(outResult, outLength);
6969
const stderr = Buffer.concat(errResult, errLength).toString('utf8');
70-
71-
let err = new Error(stderr);
72-
err.code = code;
73-
7470
const expectedStderr = expectedStderrForAction[action];
75-
if (!code && expectedStderr && stderr.match(expectedStderrForAction)) {
76-
err = null;
71+
let err = null;
72+
73+
if (code || (stderr && expectedStderr && !stderr.match(expectedStderr))) {
74+
err = new Error(stderr);
75+
err.code = code;
7776
}
7877

79-
if (typeof callback === 'function') {
78+
if (isFunction(callback)) {
8079
callback.apply(null, [err, stdout]);
8180
}
8281
});

0 commit comments

Comments
 (0)