diff options
| author | schmonz <schmonz> | 2017-06-29 17:19:13 +0000 |
|---|---|---|
| committer | schmonz <schmonz> | 2017-06-29 17:19:13 +0000 |
| commit | ea2db84759af840eee5663cbcd70c2a55c104ce5 (patch) | |
| tree | 55c7d6ab3167121b89a553724f8e90914d1bd512 | |
| parent | 268c2041df60a2a619d6a14eb082d643fc055e43 (diff) | |
| download | pkgsrc-ea2db84759af840eee5663cbcd70c2a55c104ce5.tar.gz | |
Revert patch to "be silent if there's nothing to commit." Upstream
recommends using `etckeeper unclean` to determine if there are any
changes in need of committing, which works with every VCS that
etckeeper supports. Bump PKGREVISION.
| -rw-r--r-- | sysutils/etckeeper/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/etckeeper/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/etckeeper/patches/patch-commit.d_50vcs-commit | 23 |
3 files changed, 7 insertions, 24 deletions
diff --git a/sysutils/etckeeper/Makefile b/sysutils/etckeeper/Makefile index 41eab5259f4..0adf7b40e8c 100644 --- a/sysutils/etckeeper/Makefile +++ b/sysutils/etckeeper/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.9 2017/06/17 14:25:11 schmonz Exp $ +# $NetBSD: Makefile,v 1.10 2017/06/29 17:19:13 schmonz Exp $ # DISTNAME= etckeeper_1.18.5.orig PKGNAME= ${DISTNAME:S/_/-/:S/.orig$/.1/} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/e/etckeeper/} diff --git a/sysutils/etckeeper/distinfo b/sysutils/etckeeper/distinfo index 869244da34e..0063643a62e 100644 --- a/sysutils/etckeeper/distinfo +++ b/sysutils/etckeeper/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2017/06/17 14:10:59 schmonz Exp $ +$NetBSD: distinfo,v 1.6 2017/06/29 17:19:13 schmonz Exp $ SHA1 (etckeeper_1.18.5-1.diff.gz) = c43743cdfc6aa6543d95b7f19337d545d9cbe040 RMD160 (etckeeper_1.18.5-1.diff.gz) = d7708dd7b2879e53ddd98896c7567d00da685286 @@ -9,7 +9,7 @@ RMD160 (etckeeper_1.18.5.orig.tar.gz) = 436b472276c3175cc7157d28d18345d4f4b17bd4 SHA512 (etckeeper_1.18.5.orig.tar.gz) = bfdd5ffb6ae72ebc5ea8254404280ea1c89de44cfb4c888bc40d1a8504887d198b967f46f1d3952a5a22b0f5969a8f3291e4fc1c37bbd488e4b25682d41364cd Size (etckeeper_1.18.5.orig.tar.gz) = 67166 bytes SHA1 (patch-bash__completion) = 95936127f98a76b4b7b66ddc170ba6c1e1e4c0d9 -SHA1 (patch-commit.d_50vcs-commit) = 86b150cb5e72aed9f8bb7886c699ea895e770f36 +SHA1 (patch-commit.d_50vcs-commit) = 2776cf73cc1211b4beaf14ce05aeb96ff422a19a SHA1 (patch-debian_cron.daily) = b702508cbb4dd42a3ae9f4a0b4be3a763edaf131 SHA1 (patch-etckeeper) = 07a6b61b6c79096065953d22087c32ea5d776f2c SHA1 (patch-etckeeper.8) = 7e72a7889e0478463eb2b304d2cadb44cd97aa52 diff --git a/sysutils/etckeeper/patches/patch-commit.d_50vcs-commit b/sysutils/etckeeper/patches/patch-commit.d_50vcs-commit index 97eca9dc256..805ae52232d 100644 --- a/sysutils/etckeeper/patches/patch-commit.d_50vcs-commit +++ b/sysutils/etckeeper/patches/patch-commit.d_50vcs-commit @@ -1,7 +1,7 @@ -$NetBSD: patch-commit.d_50vcs-commit,v 1.2 2017/06/17 14:10:59 schmonz Exp $ +$NetBSD: patch-commit.d_50vcs-commit,v 1.3 2017/06/29 17:19:13 schmonz Exp $ -Test more carefully for a possibly missing binary, and be silent if -there's nothing to commit. From Nathan Arthur in private mail. +Test more carefully for a possibly missing binary. From Nathan Arthur in +private mail. --- commit.d/50vcs-commit.orig 2016-07-17 23:01:39.000000000 +0000 +++ commit.d/50vcs-commit @@ -20,20 +20,3 @@ there's nothing to commit. From Nathan Arthur in private mail. fi ORIG_USER=$USER -@@ -85,10 +87,12 @@ if [ "$VCS" = git ] && [ -d .git ]; then - export GIT_COMMITTER_EMAIL - fi - fi -- if [ -n "$logfile" ]; then -- git commit $GIT_COMMIT_OPTIONS -F "$logfile" -- else -- git commit $GIT_COMMIT_OPTIONS -+ if ! git diff --cached --quiet; then -+ if [ -n "$logfile" ]; then -+ git commit $GIT_COMMIT_OPTIONS -F "$logfile" -+ else -+ git commit $GIT_COMMIT_OPTIONS -+ fi - fi - elif [ "$VCS" = hg ] && [ -d .hg ]; then - if [ -n "$USER" ]; then |