pkgmk: ignore md5sums unless signatures are missing
This commit is contained in:
parent
cc3c4ec779
commit
08ac3d2cb1
8
pkgmk.in
8
pkgmk.in
@ -327,7 +327,7 @@ check_signature() {
|
|||||||
else
|
else
|
||||||
if [ "$PKGMK_IGNORE_MD5SUM" = "no" ] && [ "$PKGMK_CHECK_SIGNATURE" = "no" ]; then
|
if [ "$PKGMK_IGNORE_MD5SUM" = "no" ] && [ "$PKGMK_CHECK_SIGNATURE" = "no" ]; then
|
||||||
warning "Signature file not found, falling back to old md5sum checking."
|
warning "Signature file not found, falling back to old md5sum checking."
|
||||||
return 0;
|
return 1;
|
||||||
fi
|
fi
|
||||||
if [ "$PKGMK_CHECK_SIGNATURE" = "yes" ]; then
|
if [ "$PKGMK_CHECK_SIGNATURE" = "yes" ]; then
|
||||||
if [ "$PKGMK_KEEP_WORK" = "no" ]; then
|
if [ "$PKGMK_KEEP_WORK" = "no" ]; then
|
||||||
@ -352,6 +352,7 @@ check_signature() {
|
|||||||
|
|
||||||
# remove soft links
|
# remove soft links
|
||||||
find $SRC -maxdepth 1 -mindepth 1 -type l -delete
|
find $SRC -maxdepth 1 -mindepth 1 -type l -delete
|
||||||
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
make_signature() {
|
make_signature() {
|
||||||
@ -503,7 +504,10 @@ make_work_dir() {
|
|||||||
|
|
||||||
if [ "$PKGMK_IGNORE_SIGNATURE" = "no" ] || [ "$PKGMK_CHECK_SIGNATURE" = "yes" ]; then
|
if [ "$PKGMK_IGNORE_SIGNATURE" = "no" ] || [ "$PKGMK_CHECK_SIGNATURE" = "yes" ]; then
|
||||||
test -f $PKGMK_SIGNATURE && cp $PKGMK_SIGNATURE $PKGMK_WORK_DIR
|
test -f $PKGMK_SIGNATURE && cp $PKGMK_SIGNATURE $PKGMK_WORK_DIR
|
||||||
check_signature
|
if check_signature
|
||||||
|
then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
if [ "$PKGMK_IGNORE_MD5SUM" = "no" ]; then
|
if [ "$PKGMK_IGNORE_MD5SUM" = "no" ]; then
|
||||||
check_md5sum
|
check_md5sum
|
||||||
|
Loading…
x
Reference in New Issue
Block a user