mirror of
https://github.com/moparisthebest/pacman
synced 2024-08-13 17:03:46 -04:00
makepkg: refactor checking source integrity
Move the source integrity checking into its own function as the code was duplicated and is now more complicated with the separation of the two checks types. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
2b3405e01b
commit
49d9426b6a
@ -764,6 +764,21 @@ check_pgpsigs() {
|
||||
fi
|
||||
}
|
||||
|
||||
check_source_integrity() {
|
||||
if (( SKIPCHECKSUMS && SKIPPGPCHECK )); then
|
||||
warning "$(gettext "Skipping all source file integrity checks.")"
|
||||
elif (( SKIPCHECKSUMS )); then
|
||||
warning "$(gettext "Skipping verification of source file checksums.")"
|
||||
check_pgpsigs
|
||||
elif (( SKIPPGPCHECK )); then
|
||||
warning "$(gettext "Skipping verification of source file PGP signatures.")"
|
||||
check_checksums
|
||||
else
|
||||
check_checksums
|
||||
check_pgpsigs
|
||||
fi
|
||||
}
|
||||
|
||||
extract_sources() {
|
||||
msg "$(gettext "Extracting Sources...")"
|
||||
local netfile
|
||||
@ -2249,18 +2264,7 @@ if (( SOURCEONLY )); then
|
||||
(( SOURCEONLY == 2 )); then
|
||||
download_sources
|
||||
fi
|
||||
if (( SKIPCHECKSUMS && SKIPPGPCHECK )); then
|
||||
warning "$(gettext "Skipping all source file integrity checks.")"
|
||||
elif (( SKIPCHECKSUMS )); then
|
||||
warning "$(gettext "Skipping verification of source file checksums.")"
|
||||
check_pgpsigs
|
||||
elif (( SKIPPGPCHECK )); then
|
||||
warning "$(gettext "Skipping verification of source file PGP signatures.")"
|
||||
check_checksums
|
||||
else
|
||||
check_checksums
|
||||
check_pgpsigs
|
||||
fi
|
||||
check_source_integrity
|
||||
cd "$startdir"
|
||||
|
||||
# if we are root or if fakeroot is not enabled, then we don't use it
|
||||
@ -2334,18 +2338,7 @@ elif (( REPKG )); then
|
||||
fi
|
||||
else
|
||||
download_sources
|
||||
if (( SKIPCHECKSUMS && SKIPPGPCHECK )); then
|
||||
warning "$(gettext "Skipping all source file integrity checks.")"
|
||||
elif (( SKIPCHECKSUMS )); then
|
||||
warning "$(gettext "Skipping verification of source file checksums.")"
|
||||
check_pgpsigs
|
||||
elif (( SKIPPGPCHECK )); then
|
||||
warning "$(gettext "Skipping verification of source file PGP signatures.")"
|
||||
check_checksums
|
||||
else
|
||||
check_checksums
|
||||
check_pgpsigs
|
||||
fi
|
||||
check_source_integrity
|
||||
extract_sources
|
||||
fi
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user