diff options
| author | Xavier Chantry <shiningxc@gmail.com> | 2009-08-10 15:50:53 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2009-09-06 15:26:32 -0500 |
| commit | 82522dd8c1f4cd9f19d0cae83368689971f48ebd (patch) | |
| tree | 90d6363d266e55053b87dc3f27a81a9a51adde73 | |
| parent | bdd8e92ff601aab44941e7572f6c48d7e32a3f24 (diff) | |
| download | pacman-82522dd8c1f4cd9f19d0cae83368689971f48ebd.tar.xz | |
makepkg: new --skipinteg option
Implements FS#15830
This option allows to build a PKGBUILD with no checksums
Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | doc/makepkg.8.txt | 4 | ||||
| -rw-r--r-- | scripts/makepkg.sh.in | 15 |
2 files changed, 15 insertions, 4 deletions
diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index e480d8e3..ad78ffcb 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -86,6 +86,10 @@ Options linkman:makepkg.conf[5]. This output can be redirected into your PKGBUILD for source validation using "`makepkg -g >> PKGBUILD`". +*--skipinteg*:: + Do not fail when the PKGBUILD does not contain any integrity checks, just + print a warning instead. + *-h, \--help*:: Output syntax and command line options. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c8384f80..126379ac 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -58,6 +58,7 @@ DEP_BIN=0 FORCE=0 INFAKEROOT=0 GENINTEG=0 +SKIPINTEG=0 INSTALL=0 NOBUILD=0 NODEPS=0 @@ -613,8 +614,12 @@ check_checksums() { done if [ $correlation -eq 0 ]; then - error "$(gettext "Integrity checks are missing.")" - exit 1 # TODO: error code + if [ $SKIPINTEG -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 +1404,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 " --skipinteg Do not fail when integrity checks are missing")" echo "$(gettext " -h, --help This help")" echo "$(gettext " -i, --install Install package after successful build")" echo "$(gettext " -L, --log Log package build process")" @@ -1447,8 +1453,8 @@ ARGLIST=$@ OPT_SHORT="AcCdefFghiLmop:rRsV" OPT_LONG="allsource,asroot,ignorearch,clean,cleancache,nodeps" OPT_LONG="$OPT_LONG,noextract,force,forcever:,geninteg,help,holdver" -OPT_LONG="$OPT_LONG,install,log,nocolor,nobuild,rmdeps,repackage,source" -OPT_LONG="$OPT_LONG,syncdeps,version,config:" +OPT_LONG="$OPT_LONG,install,log,nocolor,nobuild,rmdeps,repackage,skipinteg" +OPT_LONG="$OPT_LONG,source,syncdeps,version,config:" # Pacman Options OPT_LONG="$OPT_LONG,noconfirm,noprogressbar" OPT_TEMP="$(parse_options $OPT_SHORT $OPT_LONG "$@" || echo 'PARSE_OPTIONS FAILED')" @@ -1487,6 +1493,7 @@ while true; do -p) shift; BUILDFILE=$1 ;; -r|--rmdeps) RMDEPS=1 ;; -R|--repackage) REPKG=1 ;; + --skipinteg) SKIPINTEG=1 ;; --source) SOURCEONLY=1 ;; -s|--syncdeps) DEP_BIN=1 ;; |