Module Name: src
Committed By: martin
Date: Wed Aug 8 14:49:24 UTC 2012
Modified Files:
src/etc [netbsd-6]: daily
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.80.2.4 -r1.80.2.5 src/etc/daily
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/daily
diff -u src/etc/daily:1.80.2.4 src/etc/daily:1.80.2.5
--- src/etc/daily:1.80.2.4 Wed Aug 8 14:36:55 2012
+++ src/etc/daily Wed Aug 8 14:49:24 2012
@@ -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 @@ if checkyesno run_fsck; then
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 @@ if checkyesno run_rdist && [ -f /etc/Dis
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
