From 49d9426b6a3e6a019a0973ec73b0ff6cf402fa89 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Mon, 18 Jul 2011 19:58:54 +1000 Subject: 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 Signed-off-by: Dan McGee --- scripts/makepkg.sh.in | 41 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 136bf8c8..fa0ceb2e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -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 -- cgit v1.2.3-70-g09d2