summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Unterwurzacher2018-06-25 22:45:44 +0200
committerJakob Unterwurzacher2018-07-01 20:56:22 +0200
commit3f9a4bbcaa7c3c78b2c709373172503a67084611 (patch)
tree74a67b147c06ab9918a9b0b86f91050ee1108b00
parent1a5e9cfb1ef0191e4b0f48599a39f01244b692e4 (diff)
main: replace naked panic with log.Panic
Fix the check that failed to find the case as well.
-rw-r--r--main.go3
-rwxr-xr-xtest.bash2
2 files changed, 3 insertions, 2 deletions
diff --git a/main.go b/main.go
index 4989370..24f16bd 100644
--- a/main.go
+++ b/main.go
@@ -2,6 +2,7 @@ package main
import (
"fmt"
+ "log"
"os"
"path/filepath"
"runtime"
@@ -89,7 +90,7 @@ func changePassword(args *argContainer) {
exitcodes.Exit(err)
}
if len(masterkey) == 0 {
- panic("empty masterkey")
+ log.Panic("empty masterkey")
}
tlog.Info.Println("Please enter your new password.")
newPw := readpassword.Twice(args.extpass)
diff --git a/test.bash b/test.bash
index 5f0c7e4..d306b7e 100755
--- a/test.bash
+++ b/test.bash
@@ -64,7 +64,7 @@ else
rm -Rf $TESTDIR
fi
-if grep -R "panic(" internal ; then
+if grep -R "panic(" *.go internal ; then
echo "Please use log.Panic instead of naked panic!"
exit 1
fi