small fixes

lieser · Dec 10, 2014 · 317c8fa · 317c8fa
1 parent 039a767
commit 317c8fa
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/modules/ARHParser.jsm b/modules/ARHParser.jsm
@@ -129,7 +129,7 @@ let ARHParser = {
 	 *  @return {ARHHeader} Parsed Authentication-Results header
 	 */
 	parse: function _ARHParser_parse(authresHeader) {
-	  // remove header name
+		// remove header name
 		authresHeader = authresHeader.replace(
 			new RegExp("^Authentication-Results:"+CFWS_op, "i"), "");
 		authresHeader = new RefString(authresHeader);

diff --git a/modules/AuthVerifier.jsm b/modules/AuthVerifier.jsm
@@ -344,7 +344,6 @@ function arhDKIM_to_dkimSigResultV2(arhDKIM) {
  * @return {dkimSigResultV2}
  */
 function dkimResultV1_to_dkimSigResultV2(dkimResultV1) {
-	let dkimSigResultV2 = dkimResultV1;
 	let dkimSigResultV2 = {
 		version: "2.0",
 		result: dkimResultV1.result,

diff --git a/modules/dkimPolicy.jsm b/modules/dkimPolicy.jsm
@@ -353,7 +353,7 @@ var Policy = {
 		});
 		promise.then(null, function onReject(exception) {
 			// Failure!  We can inspect or report the exception.
-			log.fatal(exceptionToStr(exception));
+			log.warn(exceptionToStr(exception));
 		});
 		return promise;
 	},

diff --git a/modules/helper.jsm b/modules/helper.jsm
@@ -123,7 +123,7 @@ function exceptionToStr(exception) {
 	if (posStackTrace !== -1) {
 		var tmp = str.substr(posStackTrace+13);
 		tmp = tmp.replace(
-			/ < (?:[^ ]| (?!< ))*(?:Sqlite\.jsm|promise\.js|Promise\.jsm|Task\.jsm)(?:[^ ]| (?!< ))*/g,
+			/ < (?:[^ ]| (?!< ))*(?:Sqlite\.jsm|promise\.js|Promise\.jsm|Promise-backend\.js|Task\.jsm)(?:[^ ]| (?!< ))*/g,
 			""
 		);
 		str = str.substr(0, posStackTrace+13) + tmp;