Sat Jun 17 14:10:59 2017 UTC ()
Be silent if there's nothing to commit. From Nathan Arthur in private mail.


(schmonz)
diff -r1.4 -r1.5 pkgsrc/sysutils/etckeeper/distinfo
diff -r1.1 -r1.2 pkgsrc/sysutils/etckeeper/patches/patch-commit.d_50vcs-commit
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/etckeeper/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/etckeeper/distinfo 2017/05/20 01:05:05 1.4
+++ pkgsrc/sysutils/etckeeper/distinfo 2017/06/17 14:10:59 1.5
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: distinfo,v 1.4 2017/05/20 01:05:05 schmonz Exp $ 1$NetBSD: distinfo,v 1.5 2017/06/17 14:10:59 schmonz Exp $
2 2
3SHA1 (etckeeper_1.18.5-1.diff.gz) = c43743cdfc6aa6543d95b7f19337d545d9cbe040 3SHA1 (etckeeper_1.18.5-1.diff.gz) = c43743cdfc6aa6543d95b7f19337d545d9cbe040
4RMD160 (etckeeper_1.18.5-1.diff.gz) = d7708dd7b2879e53ddd98896c7567d00da685286 4RMD160 (etckeeper_1.18.5-1.diff.gz) = d7708dd7b2879e53ddd98896c7567d00da685286
5SHA512 (etckeeper_1.18.5-1.diff.gz) = 537bbeabc09a12cce9e96d21f9fc758b1982161803bc1d774386e75a1f2ab5dfe6dd925c5cbbf555017209961c2f60c5bb755bd780ab0eb52ce312ec47bfb010 5SHA512 (etckeeper_1.18.5-1.diff.gz) = 537bbeabc09a12cce9e96d21f9fc758b1982161803bc1d774386e75a1f2ab5dfe6dd925c5cbbf555017209961c2f60c5bb755bd780ab0eb52ce312ec47bfb010
6Size (etckeeper_1.18.5-1.diff.gz) = 1086 bytes 6Size (etckeeper_1.18.5-1.diff.gz) = 1086 bytes
7SHA1 (etckeeper_1.18.5.orig.tar.gz) = cccf48b130dafdb6532ebf7d1a145a58918fed18 7SHA1 (etckeeper_1.18.5.orig.tar.gz) = cccf48b130dafdb6532ebf7d1a145a58918fed18
8RMD160 (etckeeper_1.18.5.orig.tar.gz) = 436b472276c3175cc7157d28d18345d4f4b17bd4 8RMD160 (etckeeper_1.18.5.orig.tar.gz) = 436b472276c3175cc7157d28d18345d4f4b17bd4
9SHA512 (etckeeper_1.18.5.orig.tar.gz) = bfdd5ffb6ae72ebc5ea8254404280ea1c89de44cfb4c888bc40d1a8504887d198b967f46f1d3952a5a22b0f5969a8f3291e4fc1c37bbd488e4b25682d41364cd 9SHA512 (etckeeper_1.18.5.orig.tar.gz) = bfdd5ffb6ae72ebc5ea8254404280ea1c89de44cfb4c888bc40d1a8504887d198b967f46f1d3952a5a22b0f5969a8f3291e4fc1c37bbd488e4b25682d41364cd
10Size (etckeeper_1.18.5.orig.tar.gz) = 67166 bytes 10Size (etckeeper_1.18.5.orig.tar.gz) = 67166 bytes
11SHA1 (patch-bash__completion) = 95936127f98a76b4b7b66ddc170ba6c1e1e4c0d9 11SHA1 (patch-bash__completion) = 95936127f98a76b4b7b66ddc170ba6c1e1e4c0d9
12SHA1 (patch-commit.d_50vcs-commit) = 2776cf73cc1211b4beaf14ce05aeb96ff422a19a 12SHA1 (patch-commit.d_50vcs-commit) = 86b150cb5e72aed9f8bb7886c699ea895e770f36
13SHA1 (patch-debian_cron.daily) = b702508cbb4dd42a3ae9f4a0b4be3a763edaf131 13SHA1 (patch-debian_cron.daily) = b702508cbb4dd42a3ae9f4a0b4be3a763edaf131
14SHA1 (patch-etckeeper) = 07a6b61b6c79096065953d22087c32ea5d776f2c 14SHA1 (patch-etckeeper) = 07a6b61b6c79096065953d22087c32ea5d776f2c
15SHA1 (patch-etckeeper.8) = 7e72a7889e0478463eb2b304d2cadb44cd97aa52 15SHA1 (patch-etckeeper.8) = 7e72a7889e0478463eb2b304d2cadb44cd97aa52
16SHA1 (patch-etckeeper.conf) = 3da6944c550aaa85ea9458aea583b7a7d051a0e0 16SHA1 (patch-etckeeper.conf) = 3da6944c550aaa85ea9458aea583b7a7d051a0e0
17SHA1 (patch-init.d_40vcs-init) = d267d4e7e2b82353614ed15455c2739e1c8f92d6 17SHA1 (patch-init.d_40vcs-init) = d267d4e7e2b82353614ed15455c2739e1c8f92d6
18SHA1 (patch-list-installed.d_50list-installed) = 966c9471767a1808010af62117edc892e88670a2 18SHA1 (patch-list-installed.d_50list-installed) = 966c9471767a1808010af62117edc892e88670a2
19SHA1 (patch-post-install.d_50vcs-commit) = 1a95a720bdbdb1ace30289204bf0888aab741e8b 19SHA1 (patch-post-install.d_50vcs-commit) = 1a95a720bdbdb1ace30289204bf0888aab741e8b
20SHA1 (patch-pre-install.d_10packagelist) = c2a305746aca54091856c2b70543abd42410446a 20SHA1 (patch-pre-install.d_10packagelist) = c2a305746aca54091856c2b70543abd42410446a
21SHA1 (patch-pre-install.d_50uncommitted-changes) = be883cd2fc9272c0df6d990fb1cf32b787d23a9d 21SHA1 (patch-pre-install.d_50uncommitted-changes) = be883cd2fc9272c0df6d990fb1cf32b787d23a9d
22SHA1 (patch-update-ignore.d_01update-ignore) = 3e73493f268da3d40623fcd192d3da911357acee 22SHA1 (patch-update-ignore.d_01update-ignore) = 3e73493f268da3d40623fcd192d3da911357acee
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/etckeeper/patches/patch-commit.d_50vcs-commit (expand / switch to unified diff)

--- pkgsrc/sysutils/etckeeper/patches/patch-commit.d_50vcs-commit 2017/05/20 01:05:05 1.1
+++ pkgsrc/sysutils/etckeeper/patches/patch-commit.d_50vcs-commit 2017/06/17 14:10:59 1.2
@@ -1,22 +1,39 @@ @@ -1,22 +1,39 @@
1$NetBSD: patch-commit.d_50vcs-commit,v 1.1 2017/05/20 01:05:05 schmonz Exp $ 1$NetBSD: patch-commit.d_50vcs-commit,v 1.2 2017/06/17 14:10:59 schmonz Exp $
2 2
3Test more carefully for a possibly missing binary. From Nathan Arthur in 3Test more carefully for a possibly missing binary, and be silent if
4private mail. 4there's nothing to commit. From Nathan Arthur in private mail.
5 5
6--- commit.d/50vcs-commit.orig 2016-07-17 23:01:39.000000000 +0000 6--- commit.d/50vcs-commit.orig 2016-07-17 23:01:39.000000000 +0000
7+++ commit.d/50vcs-commit 7+++ commit.d/50vcs-commit
8@@ -23,9 +23,11 @@ fi 8@@ -23,9 +23,11 @@ fi
9  9
10 hostname=`hostname` 10 hostname=`hostname`
11 hostname="${hostname%%.*}" 11 hostname="${hostname%%.*}"
12-dnsdomainname=`dnsdomainname 2>/dev/null || true` 12-dnsdomainname=`dnsdomainname 2>/dev/null || true`
13-if [ -n "$dnsdomainname" ]; then 13-if [ -n "$dnsdomainname" ]; then
14- hostname="$hostname.$dnsdomainname" 14- hostname="$hostname.$dnsdomainname"
15+if command -v dnsdomainname >/dev/null; then 15+if command -v dnsdomainname >/dev/null; then
16+ dnsdomainname=`dnsdomainname 2>/dev/null || true` 16+ dnsdomainname=`dnsdomainname 2>/dev/null || true`
17+ if [ -n "$dnsdomainname" ]; then 17+ if [ -n "$dnsdomainname" ]; then
18+ hostname="$hostname.$dnsdomainname" 18+ hostname="$hostname.$dnsdomainname"
19+ fi 19+ fi
20 fi 20 fi
21  21
22 ORIG_USER=$USER 22 ORIG_USER=$USER
 23@@ -85,10 +87,12 @@ if [ "$VCS" = git ] && [ -d .git ]; then
 24 export GIT_COMMITTER_EMAIL
 25 fi
 26 fi
 27- if [ -n "$logfile" ]; then
 28- git commit $GIT_COMMIT_OPTIONS -F "$logfile"
 29- else
 30- git commit $GIT_COMMIT_OPTIONS
 31+ if ! git diff --cached --quiet; then
 32+ if [ -n "$logfile" ]; then
 33+ git commit $GIT_COMMIT_OPTIONS -F "$logfile"
 34+ else
 35+ git commit $GIT_COMMIT_OPTIONS
 36+ fi
 37 fi
 38 elif [ "$VCS" = hg ] && [ -d .hg ]; then
 39 if [ -n "$USER" ]; then