From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 188C2139085 for ; Fri, 27 Jan 2017 22:12:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6D572E0DCD; Fri, 27 Jan 2017 22:12:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3BAF8E0DCD for ; Fri, 27 Jan 2017 22:12:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8CAD53413AA for ; Fri, 27 Jan 2017 22:12:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0987B31E9 for ; Fri, 27 Jan 2017 22:12:43 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1485555139.8bf890eba651c222a76f06d2fd3bfdb076cc811e.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/smartmontools/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/smartmontools/smartmontools-6.4-r1.ebuild sys-apps/smartmontools/smartmontools-6.4.ebuild sys-apps/smartmontools/smartmontools-6.5.ebuild sys-apps/smartmontools/smartmontools-9999.ebuild X-VCS-Directories: sys-apps/smartmontools/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 8bf890eba651c222a76f06d2fd3bfdb076cc811e X-VCS-Branch: master Date: Fri, 27 Jan 2017 22:12:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2f867af8-acf2-4cdd-b9bf-bd48c1156461 X-Archives-Hash: 0e02dfdfebe3072e7d7ed331a48ce4ea commit: 8bf890eba651c222a76f06d2fd3bfdb076cc811e Author: James Broadhead gmail com> AuthorDate: Fri Jan 27 20:11:04 2017 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Fri Jan 27 22:12:19 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bf890eb sys-apps/smartmontools: fix update warning - update warning about updating the drivedb, so that it notices the useflag - fix description so that it's short enough (adapted from the smartmontools website) -- repoman - quote some variables -- shellcheck - update the copy of the warning Fixes: https://bugs.gentoo.org/show_bug.cgi?id=587372 (cherry picked from commit 890093680d63a1b50d02e6408b55d4d748fcdbdb) Signed-off-by: Robin H. Johnson gentoo.org> Fixes: https://github.com/gentoo/gentoo/pull/3114 sys-apps/smartmontools/smartmontools-6.4-r1.ebuild | 12 ++++++------ sys-apps/smartmontools/smartmontools-6.4.ebuild | 4 ++-- sys-apps/smartmontools/smartmontools-6.5.ebuild | 21 +++++++++++++-------- sys-apps/smartmontools/smartmontools-9999.ebuild | 21 +++++++++++++-------- 4 files changed, 34 insertions(+), 24 deletions(-) diff --git a/sys-apps/smartmontools/smartmontools-6.4-r1.ebuild b/sys-apps/smartmontools/smartmontools-6.4-r1.ebuild index 3746b94..a5f54df 100644 --- a/sys-apps/smartmontools/smartmontools-6.4-r1.ebuild +++ b/sys-apps/smartmontools/smartmontools-6.4-r1.ebuild @@ -14,7 +14,7 @@ else KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~x64-macos" fi -DESCRIPTION="Self-Monitoring, Analysis and Reporting Technology System (S.M.A.R.T.) monitoring tools" +DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation" HOMEPAGE="https://www.smartmontools.org" LICENSE="GPL-2" @@ -72,8 +72,8 @@ src_install() { newconfd "${FILESDIR}"/smartd.confd smartd # Move drivedb.h file out of PM's sight (bug #575292) - mv "${ED}"${db_path}/drivedb.h "${T}" || die - keepdir ${db_path} + mv "${ED}${db_path}/drivedb.h" "${T}" || die + keepdir "${db_path}" exeinto /etc/cron.monthly doexe "${FILESDIR}"/${PN}-update-drivedb @@ -85,14 +85,14 @@ pkg_postinst() { local db_path="/var/db/${PN}" if [[ -f "${db_path}/drivedb.h" ]] ; then - ewarn "WARNING! The drive database file has been replaced with the version that" - ewarn "got shipped with this release of ${PN}. You may want to update the" + ewarn "WARNING! The existing copy of the drive database has been replaced with the version that" + ewarn "was shipped with this release of ${PN}. You may want to update the" ewarn "database by running the following command as root:" ewarn "" ewarn "/usr/sbin/update-smart-drivedb" fi # Move drivedb.h to /var/db/${PN} (bug #575292) - mv "${T}"/drivedb.h ${db_path} || die + mv "${T}"/drivedb.h "${db_path}" || die fi } diff --git a/sys-apps/smartmontools/smartmontools-6.4.ebuild b/sys-apps/smartmontools/smartmontools-6.4.ebuild index ca0d4ff..49a2c8c 100644 --- a/sys-apps/smartmontools/smartmontools-6.4.ebuild +++ b/sys-apps/smartmontools/smartmontools-6.4.ebuild @@ -14,8 +14,8 @@ else KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~x64-macos" fi -DESCRIPTION="Self-Monitoring, Analysis and Reporting Technology System (S.M.A.R.T.) monitoring tools" -HOMEPAGE="http://smartmontools.sourceforge.net/" +DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation" +HOMEPAGE="https://www.smartmontools.org" LICENSE="GPL-2" SLOT="0" diff --git a/sys-apps/smartmontools/smartmontools-6.5.ebuild b/sys-apps/smartmontools/smartmontools-6.5.ebuild index 5d33f5c..ff73205 100644 --- a/sys-apps/smartmontools/smartmontools-6.5.ebuild +++ b/sys-apps/smartmontools/smartmontools-6.5.ebuild @@ -14,7 +14,7 @@ else KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~x64-macos" fi -DESCRIPTION="Self-Monitoring, Analysis and Reporting Technology System (S.M.A.R.T.) monitoring tools" +DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation" HOMEPAGE="https://www.smartmontools.org" LICENSE="GPL-2" @@ -68,13 +68,13 @@ src_install() { newinitd "${FILESDIR}"/smartd-r1.rc smartd newconfd "${FILESDIR}"/smartd.confd smartd - keepdir ${db_path} + keepdir "${db_path}" if use update_drivedb ; then # Move drivedb.h file out of PM's sight (bug #575292) - mv "${ED}"${db_path}/drivedb.h "${T}" || die + mv "${ED}${db_path}/drivedb.h" "${T}" || die exeinto /etc/cron.monthly - doexe "${FILESDIR}"/${PN}-update-drivedb + doexe "${FILESDIR}/${PN}-update-drivedb" fi fi } @@ -84,16 +84,21 @@ pkg_postinst() { local db_path="/var/db/${PN}" if [[ -f "${db_path}/drivedb.h" ]] ; then - ewarn "WARNING! The drive database file has been replaced with the version that" - ewarn "got shipped with this release of ${PN}. You may want to update the" - ewarn "database by running the following command as root:" + ewarn "WARNING! The existing copy of the drive database has been replaced with the version that" + ewarn "was shipped with this release of ${PN}. You may want to update the" + ewarn "database by: " + + if ! use update_drivedb ; then + ewarn "re-merging ${PN} with USE='update_drivedb', then" + fi + ewarn "running the following command as root:" ewarn "" ewarn "/usr/sbin/update-smart-drivedb" fi if use update_drivedb ; then # Move drivedb.h to /var/db/${PN} (bug #575292) - mv "${T}"/drivedb.h ${db_path} || die + mv "${T}"/drivedb.h "${db_path}" || die fi fi } diff --git a/sys-apps/smartmontools/smartmontools-9999.ebuild b/sys-apps/smartmontools/smartmontools-9999.ebuild index 5d33f5c..ff73205 100644 --- a/sys-apps/smartmontools/smartmontools-9999.ebuild +++ b/sys-apps/smartmontools/smartmontools-9999.ebuild @@ -14,7 +14,7 @@ else KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~x64-macos" fi -DESCRIPTION="Self-Monitoring, Analysis and Reporting Technology System (S.M.A.R.T.) monitoring tools" +DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation" HOMEPAGE="https://www.smartmontools.org" LICENSE="GPL-2" @@ -68,13 +68,13 @@ src_install() { newinitd "${FILESDIR}"/smartd-r1.rc smartd newconfd "${FILESDIR}"/smartd.confd smartd - keepdir ${db_path} + keepdir "${db_path}" if use update_drivedb ; then # Move drivedb.h file out of PM's sight (bug #575292) - mv "${ED}"${db_path}/drivedb.h "${T}" || die + mv "${ED}${db_path}/drivedb.h" "${T}" || die exeinto /etc/cron.monthly - doexe "${FILESDIR}"/${PN}-update-drivedb + doexe "${FILESDIR}/${PN}-update-drivedb" fi fi } @@ -84,16 +84,21 @@ pkg_postinst() { local db_path="/var/db/${PN}" if [[ -f "${db_path}/drivedb.h" ]] ; then - ewarn "WARNING! The drive database file has been replaced with the version that" - ewarn "got shipped with this release of ${PN}. You may want to update the" - ewarn "database by running the following command as root:" + ewarn "WARNING! The existing copy of the drive database has been replaced with the version that" + ewarn "was shipped with this release of ${PN}. You may want to update the" + ewarn "database by: " + + if ! use update_drivedb ; then + ewarn "re-merging ${PN} with USE='update_drivedb', then" + fi + ewarn "running the following command as root:" ewarn "" ewarn "/usr/sbin/update-smart-drivedb" fi if use update_drivedb ; then # Move drivedb.h to /var/db/${PN} (bug #575292) - mv "${T}"/drivedb.h ${db_path} || die + mv "${T}"/drivedb.h "${db_path}" || die fi fi }