bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makepkg: rework --skipinteg

Browse source 
The current --skipinteg is a bit weird.  It does not skip integrity
checks, but instead does them and prints a warning. Change this
behaviour to actually skipping the checks.

Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Allan McRae 2009-10-11 21:50:45 +10:00 • committed by Dan McGee
parent 79987c92cb
commit 2ce444ee10
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/makepkg.8.txt
View file

@ -88,8 +88,7 @@ Options
using "`makepkg -g >> PKGBUILD`". using "`makepkg -g >> PKGBUILD`".
*--skipinteg*:: *--skipinteg*::
Do not fail when the PKGBUILD does not contain any integrity checks, just Do not perform any integrity checks, just print a warning instead.
print a warning instead.
*-h, \--help*:: *-h, \--help*::
Output syntax and command line options. Output syntax and command line options.

14
scripts/makepkg.sh.in
View file

@ -636,12 +636,8 @@ check_checksums() {
done done
if (( ! correlation )); then if (( ! correlation )); then
if (( SKIPINTEG )); then error "$(gettext "Integrity checks are missing.")"
warning "$(gettext "Integrity checks are missing.")" exit 1 # TODO: error code
else
error "$(gettext "Integrity checks are missing.")"
exit 1 # TODO: error code
fi
fi fi
} }
@ -1970,7 +1966,11 @@ elif (( REPKG )); then
fi fi
else else
download_sources download_sources
check_checksums if (( ! SKIPINTEG )); then
check_checksums
else
warning "$(gettext "Skipping integrity checks.")"
fi
extract_sources extract_sources
fi fi