diff --git a/scripts/pkgmeek b/scripts/pkgmeek index b39f067..443753d 100755 --- a/scripts/pkgmeek +++ b/scripts/pkgmeek @@ -76,7 +76,8 @@ done ; } check_pkg_mtime; pkg_utd=$? [ "$PKGMK_MTIME_ONLY" = "no" ] || [ "$PKGMK_CHECK_SIG" = "yes" ] || exit $pkg_utd -# Stop here if the user did not request an action that can be done with just the source files. +# Can stop here if the user asked for '-do', but honor any requests for '-um', '-us', +# '-eo', or '-uf' by proceeding to those steps [ "$PKGMK_DOWNLOAD_ONLY" = "no" ] || [ "$PKGMK_UPDATE_MD5" = "yes" ] || \ [ "$PKGMK_UPDATE_FOOTPRINT" = "yes" ] || [ "$PKGMK_UPDATE_SIG" = "yes" ] || \ [ "$PKGMK_EXTRACT_ONLY" = "yes" ] || exit 0 @@ -410,7 +411,7 @@ cat_manifest() { } check_manifest() { - local FILTER CN CM + local FILTER CN local TRUTH="$PKGMK_ROOT/.$1"; local retval=0; local severity=error; [ -f "$pkg_dir$package" ] || [ "$1" = "md5sum" ] || \ { error "$package not found. Cannot check $1."; return "$E_MANIFEST"; } @@ -421,10 +422,8 @@ check_manifest() { sed '/^@@/d; /^+++/d; /^---/d; s/^+/NEW /g; s/^-/MISSING /g' > ".$1.diff" if [ -s ".$1.diff" ]; then CN=$(grep -c ^NEW ".$1.diff") - CM=$(grep -c ^MISSING ".$1.diff") if [ "$1" = "footprint" ]; then [ "$PKGMK_IGNORE_NEW" = "no" ] && retval+=$CN || severity=warning - [ "$PKGMK_IGNORE_MISSING" = "no" ] && retval+=$CM retval=$(( E_MANIFEST*( retval>0 ) )) else retval=$E_MANIFEST