summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFredrik Rinnestam <fredrik@crux.nu>2017-04-05 21:58:09 +0200
committerFredrik Rinnestam <fredrik@crux.nu>2017-04-05 21:58:09 +0200
commit08ac3d2cb1e6bb898531f43b8bcad502423fd0b5 (patch)
tree4f754002fb75a0f8df2519eefda3dda50d7b7e0f
parentcc3c4ec7798abff084647fbae650382a3c76e22b (diff)
downloadpkgutils-08ac3d2cb1e6bb898531f43b8bcad502423fd0b5.tar.gz
pkgutils-08ac3d2cb1e6bb898531f43b8bcad502423fd0b5.tar.xz
pkgmk: ignore md5sums unless signatures are missing
-rwxr-xr-xpkgmk.in8
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgmk.in b/pkgmk.in
index 36f5d784..10847831 100755
--- a/pkgmk.in
+++ b/pkgmk.in
@@ -327,7 +327,7 @@ check_signature() {
else
if [ "$PKGMK_IGNORE_MD5SUM" = "no" ] && [ "$PKGMK_CHECK_SIGNATURE" = "no" ]; then
warning "Signature file not found, falling back to old md5sum checking."
- return 0;
+ return 1;
fi
if [ "$PKGMK_CHECK_SIGNATURE" = "yes" ]; then
if [ "$PKGMK_KEEP_WORK" = "no" ]; then
@@ -352,6 +352,7 @@ check_signature() {
# remove soft links
find $SRC -maxdepth 1 -mindepth 1 -type l -delete
+ return 0
}
make_signature() {
@@ -503,7 +504,10 @@ make_work_dir() {
if [ "$PKGMK_IGNORE_SIGNATURE" = "no" ] || [ "$PKGMK_CHECK_SIGNATURE" = "yes" ]; then
test -f $PKGMK_SIGNATURE && cp $PKGMK_SIGNATURE $PKGMK_WORK_DIR
- check_signature
+ if check_signature
+ then
+ return 0
+ fi
fi
if [ "$PKGMK_IGNORE_MD5SUM" = "no" ]; then
check_md5sum

Generated by cgit