Module Name: src
Committed By: martin
Date: Sun Jan 3 08:44:59 UTC 2016
Modified Files:
src/usr.sbin/etcupdate: etcupdate
Log Message:
>From Jim Bernard in PR install/50615: install_checksum expects a path
relative to ${DESTDIR}, and most callers did pass it that way - fix the
one place where it eroneously was called with a ${DESTDIR} path.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/usr.sbin/etcupdate/etcupdate
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/etcupdate/etcupdate
diff -u src/usr.sbin/etcupdate/etcupdate:1.59 src/usr.sbin/etcupdate/etcupdate:1.60
--- src/usr.sbin/etcupdate/etcupdate:1.59 Thu Nov 13 07:11:06 2014
+++ src/usr.sbin/etcupdate/etcupdate Sun Jan 3 08:44:59 2016
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: etcupdate,v 1.59 2014/11/13 07:11:06 apb Exp $
+# $NetBSD: etcupdate,v 1.60 2016/01/03 08:44:59 martin Exp $
#
# Copyright (c) 2001-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -280,7 +280,7 @@ diff_and_merge_file() {
if cmp -s "${TEMPROOT}${1}" "${DESTDIR}${1}"; then
verbose "===> ${1} (ok)"
rm -f "${TEMPROOT}${1}"
- install_checksum "${DESTDIR}${1}"
+ install_checksum "${1}"
return
fi
