diff -urp pacman-3.3.0/scripts/makepkg.sh.in pacman-3.3.0.new/scripts/makepkg.sh.in --- pacman-3.3.0/scripts/makepkg.sh.in 2009-07-27 00:29:04.000000000 -0400 +++ pacman-3.3.0.new/scripts/makepkg.sh.in 2009-08-06 09:31:55.070239384 -0400 @@ -58,6 +58,7 @@ DEP_BIN=0 FORCE=0 INFAKEROOT=0 GENINTEG=0 +WARNINTEG=0 INSTALL=0 NOBUILD=0 NODEPS=0 @@ -607,14 +608,22 @@ check_checksums() { exit 1 # TODO: error code fi elif [ ${#integrity_sums[@]} -gt 0 ]; then - error "$(gettext "Integrity checks (%s) differ in size from the source array.")" "$integ" - exit 1 # TODO: error code + if [ "$WARNINTEG" -eq 1 ]; then + warning "$(gettext "Integrity checks (%s) differ in size from the source array.")" "$integ" + else + error "$(gettext "Integrity checks (%s) differ in size from the source array.")" "$integ" + exit 1 # TODO: error code + fi fi done if [ $correlation -eq 0 ]; then - error "$(gettext "Integrity checks are missing.")" - exit 1 # TODO: error code + if [ "$WARNINTEG" -eq 1 ]; then + warning "$(gettext "Integrity checks are missing.")" + else + error "$(gettext "Integrity checks are missing.")" + exit 1 # TODO: error code + fi fi } @@ -1399,6 +1408,7 @@ usage() { echo "$(gettext " -e, --noextract Do not extract source files (use existing src/ dir)")" echo "$(gettext " -f, --force Overwrite existing package")" echo "$(gettext " -g, --geninteg Generate integrity checks for source files")" + echo "$(gettext " -G, --warninteg Only warn instead of failing if integrity checks are incomplete or missing")" echo "$(gettext " -h, --help This help")" echo "$(gettext " -i, --install Install package after successful build")" echo "$(gettext " -L, --log Log package build process")" @@ -1444,9 +1454,9 @@ fi ARGLIST=$@ # Parse Command Line Options. -OPT_SHORT="AbcCdefFghiLmop:rRsV" +OPT_SHORT="AbcCdefFgGhiLmop:rRsV" OPT_LONG="allsource,asroot,ignorearch,builddeps,clean,cleancache,nodeps" -OPT_LONG="$OPT_LONG,noextract,force,forcever:,geninteg,help,holdver" +OPT_LONG="$OPT_LONG,noextract,force,forcever:,geninteg,warninteg,help,holdver" OPT_LONG="$OPT_LONG,install,log,nocolor,nobuild,rmdeps,repackage,source" OPT_LONG="$OPT_LONG,syncdeps,version,config:" # Pacman Options @@ -1479,6 +1489,7 @@ while true; do --forcever) shift; FORCE_VER=$1;; -F) INFAKEROOT=1 ;; -g|--geninteg) GENINTEG=1 ;; + -G|--warninteg) WARNINTEG=1 ;; --holdver) HOLDVER=1 ;; -i|--install) INSTALL=1 ;; -L|--log) LOGGING=1 ;;