summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-06-28 16:29:32 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-06-28 16:29:32 -0400
commit51a2682158fe2ae7ca7283d2bf2addeedfd82460 (patch)
tree3c3e5141f955048ed05fff03b33943c9e708a0b6
parent9029b9779edb845f577e09f40484221ebc6809de (diff)
Use hostname if hostname -f fails. Closes: #533295
-rwxr-xr-xcommit.d/50vcs-commit2
-rw-r--r--debian/changelog6
2 files changed, 7 insertions, 1 deletions
diff --git a/commit.d/50vcs-commit b/commit.d/50vcs-commit
index 1f4ab03..687a2ed 100755
--- a/commit.d/50vcs-commit
+++ b/commit.d/50vcs-commit
@@ -2,7 +2,7 @@
set -e
message="$1"
-hostname=`hostname -f`
+hostname=`hostname -f 2>/dev/null || hostname`
if [ "$VCS" = git ] && [ -d .git ]; then
if [ -n "$SUDO_USER" ]; then
diff --git a/debian/changelog b/debian/changelog
index b6a17e5..b80418b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+etckeeper (0.38) UNRELEASED; urgency=low
+
+ * Use hostname if hostname -f fails. Closes: #533295
+
+ -- Joey Hess <joeyh@debian.org> Sun, 28 Jun 2009 16:29:17 -0400
+
etckeeper (0.37) unstable; urgency=low
* Make postinst check for the configured VCS before trying to run