Date: Sat, 27 Jul 2019 11:41:13 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r507396 - in head/sysutils/acts: . files Message-ID: <201907271141.x6RBfDcm065523@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Sat Jul 27 11:41:12 2019 New Revision: 507396 URL: https://svnweb.freebsd.org/changeset/ports/507396 Log: acts: Fix excessive message spewing - Add upstream patch to fix a case where tarsnap messages are repeated multiple times in acts output - Bump PORTREVISION - Take maintainership. Thank you to Mark, who looked after this port for over 4 years! Approved by: feld Added: head/sysutils/acts/files/patch-acts (contents, props changed) Modified: head/sysutils/acts/Makefile head/sysutils/acts/pkg-descr Modified: head/sysutils/acts/Makefile ============================================================================== --- head/sysutils/acts/Makefile Sat Jul 27 09:02:22 2019 (r507395) +++ head/sysutils/acts/Makefile Sat Jul 27 11:41:12 2019 (r507396) @@ -4,9 +4,10 @@ PORTNAME= acts PORTVERSION= 1.4.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= sysutils archivers -MAINTAINER= feld@FreeBSD.org +MAINTAINER= adamw@FreeBSD.org COMMENT= Another Calendar-based Tarsnap Script LICENSE= PD @@ -20,7 +21,7 @@ NO_BUILD= yes NO_ARCH= yes do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/acts ${STAGEDIR}${PREFIX}/bin/acts - ${INSTALL_DATA} ${WRKSRC}/acts.conf.sample ${STAGEDIR}${PREFIX}/etc/acts.conf.sample + ${INSTALL_SCRIPT} ${WRKSRC}/acts ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/acts.conf.sample ${STAGEDIR}${PREFIX}/etc .include <bsd.port.mk> Added: head/sysutils/acts/files/patch-acts ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/acts/files/patch-acts Sat Jul 27 11:41:12 2019 (r507396) @@ -0,0 +1,33 @@ +From 8230c749dd92ce6d5fd7b742525e8c9701f4bacb Mon Sep 17 00:00:00 2001 +From: Adam Weinberger <adamw@adamw.org> +Date: Tue, 16 Jul 2019 06:16:27 -0600 +Subject: [PATCH] Wrap the archive deletion tarsnap call + +With it unwrapped, if you call tarsnap with --print-stats, or if that +is in your tarsnap.conf, you'll get the stats printed after every +archive deletion. + +While the information is great to have, if you have many targets, +you get 5n lines of output, with nothing indicating which target it's +referring to. It might be worth exploring a better way to show how +much data got added and/or removed for each target, given that tarsnap +can automatically give that info right back to acts. +--- + acts | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/acts b/acts +index 4dc1803..63f35cb 100755 +--- acts.orig ++++ acts +@@ -238,7 +238,9 @@ prune_backups() { + log_verbose "message=\"Deleting backup prefix $archiveprefixtodel*\"" + echo "$archives" | grep -E "^$archiveprefixtodel" | while read -r archivetodel; do + log_debug "message=\"Deleting backup $archivetodel\"" +- $tarsnap -d -f "$archivetodel" ++ if ! output="$($tarsnap -d -f "$archivetodel" 2>&1)"; then ++ log_message "delete-error type=$backuplevel output=\"$(echo $output | tr '\n' " ")\"" ++ fi + done + done + else Modified: head/sysutils/acts/pkg-descr ============================================================================== --- head/sysutils/acts/pkg-descr Sat Jul 27 09:02:22 2019 (r507395) +++ head/sysutils/acts/pkg-descr Sat Jul 27 11:41:12 2019 (r507396) @@ -5,7 +5,7 @@ Some design goals: Calendar-based (daily, monthly, yearly) backup schedule Portable, small code footprint. -One Tarsnap archive is created per-target per-run. 31 daily, 12 monthly, -and indefinite yearly backups are kept. +By default, 31 daily, 12 monthly, and indefinite yearly backups +are kept. WWW: https://github.com/alexjurkiewicz/acts
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907271141.x6RBfDcm065523>