[src/netbsd-6]: src/etc Include rev 1.86 in the pullup of ticket 457 as well:...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9f2b370f148d
branches:  netbsd-6
changeset: 774386:9f2b370f148d
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Aug 08 14:49:24 2012 +0000

description:
Include rev 1.86 in the pullup of ticket 457 as well: only print "fetching"
message, if we actually try to fetch the package vulnerabilities file.

diffstat:

 etc/daily |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (43 lines):

diff -r 5f524c82ffbd -r 9f2b370f148d etc/daily
--- a/etc/daily Wed Aug 08 14:39:20 2012 +0000
+++ b/etc/daily Wed Aug 08 14:49:24 2012 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#      $NetBSD: daily,v 1.80.2.4 2012/08/08 14:36:55 martin Exp $
+#      $NetBSD: daily,v 1.80.2.5 2012/08/08 14:49:24 martin Exp $
 #      @(#)daily       8.2 (Berkeley) 1/25/94
 #
 
@@ -246,8 +246,8 @@
        fsck -n -f ${run_fsck_flags} | grep -v '^\*\* Phase'
 fi
 
-echo ""
 if checkyesno run_rdist && [ -f /etc/Distfile ]; then
+       echo ""
        echo "Running rdist:"
        if [ -d /var/log/rdist ]; then
                logf="$(date +%Y.%b.%d)"
@@ -258,15 +258,15 @@
 fi
 
 if pkg_info ${_compat_K_flag} -q -E '*'; then
-       echo ""
-       echo "Fetching package vulnerabilities database:"
-       if checkyesno fetch_pkg_vulnerabilities; then
-               ( umask 022 && pkg_admin ${_compat_K_flag} \
-                   fetch-pkg-vulnerabilities -u )
-       elif [ -z "$fetch_pkg_vulnerabilities" ]; then
+       if [ -z "fetch_pkg_vulnerabilities" ]; then
                echo "fetch_pkg_vulnerabilities is not set in daily.conf(5)."
                echo "You should set it to YES to enable vulnerability checks"
                echo "or set it to NO to get rid of this warning."
+       elif checkyesno fetch_pkg_vulnerabilities; then
+               echo ""
+               echo "Fetching package vulnerabilities database:"
+               ( umask 022 && pkg_admin ${_compat_K_flag} \
+                   fetch-pkg-vulnerabilities -u )
        fi
 fi