diff --git a/pkgmk.8.in b/pkgmk.8.in index b9fca26..1b60197 100644 --- a/pkgmk.8.in +++ b/pkgmk.8.in @@ -43,6 +43,9 @@ Update footprint and treat last build as successful. .B "\-if, \-\-ignore\-footprint" Build package without checking footprint. .TP +.B "\-in, \-\-ignore\-new" +Build package, ignore new files in a footprint missmatch. +.TP .B "\-um, \-\-update\-md5sum" Update md5sum using the current source files. .TP diff --git a/pkgmk.conf b/pkgmk.conf index 07b1cbd..30bdd54 100644 --- a/pkgmk.conf +++ b/pkgmk.conf @@ -11,6 +11,7 @@ export CXXFLAGS="-O2 -march=i686 -pipe" # PKGMK_WORK_DIR="$PWD/work" # PKGMK_DOWNLOAD="no" # PKGMK_IGNORE_FOOTPRINT="no" +# PKGMK_IGNORE_NEW="no" # PKGMK_NO_STRIP="no" # PKGMK_WGET_OPTS="" diff --git a/pkgmk.in b/pkgmk.in index c7f5432..2a1c027 100755 --- a/pkgmk.in +++ b/pkgmk.in @@ -318,9 +318,14 @@ check_footprint() { sed 's/^+/NEW /g' | \ sed 's/^-/MISSING /g' > $FILE.footprint.diff if [ -s $FILE.footprint.diff ]; then - error "Footprint mismatch found:" + if [ "$PKGMK_IGNORE_NEW" = "yes" ] && \ + [ -z "$(egrep -l ^MISSING $FILE.footprint.diff)" ] ; then + info "New files found:" + else + error "Footprint mismatch found:" + BUILD_SUCCESSFUL="no" + fi cat $FILE.footprint.diff >&2 - BUILD_SUCCESSFUL="no" fi else warning "Footprint not found, creating new." @@ -514,6 +519,7 @@ print_help() { echo " -utd, --up-to-date do not build, only check if package is up to date" echo " -uf, --update-footprint update footprint using result from last build" echo " -if, --ignore-footprint build package without checking footprint" + echo " -in, --ignore-new build package, ignore new files in a footprint missmatch" echo " -um, --update-md5sum update md5sum" echo " -im, --ignore-md5sum build package without checking md5sum" echo " -cm, --check-md5sum do not build, only check md5sum" @@ -548,6 +554,8 @@ parse_options() { PKGMK_UPDATE_FOOTPRINT="yes" ;; -if|--ignore-footprint) PKGMK_IGNORE_FOOTPRINT="yes" ;; + -in|--ignore-new) + PKGMK_IGNORE_NEW="yes" ;; -um|--update-md5sum) PKGMK_UPDATE_MD5SUM="yes" ;; -im|--ignore-md5sum) @@ -690,6 +698,7 @@ PKGMK_EXTRACT_ONLY="no" PKGMK_UP_TO_DATE="no" PKGMK_UPDATE_FOOTPRINT="no" PKGMK_IGNORE_FOOTPRINT="no" +PKGMK_IGNORE_NEW="no" PKGMK_FORCE="no" PKGMK_KEEP_WORK="no" PKGMK_UPDATE_MD5SUM="no"