From 111c34f92e8bcd37ae0805cb4c97682d6b7f1610 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Tue, 29 Jan 2019 19:51:51 +0100
Subject: [PATCH] make "hostname" short, even on misconfigured systems, fixes
 #4262

---
 src/borg/platform/base.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/borg/platform/base.py b/src/borg/platform/base.py
index c4e11f270..650d19dee 100644
--- a/src/borg/platform/base.py
+++ b/src/borg/platform/base.py
@@ -249,6 +249,9 @@ def getfqdn(name=''):
 # XXX this sometimes requires live internet access for issuing a DNS query in the background.
 hostname = socket.gethostname()
 fqdn = getfqdn(hostname)
+# some people put the fqdn into /etc/hostname (which is wrong, should be the short hostname)
+# fix this (do the same as "hostname --short" cli command does internally):
+hostname = hostname.split('.')[0]
 
 # uuid.getnode() is problematic in some environments (e.g. OpenVZ, see #3968) where the virtual MAC address
 # is all-zero. uuid.getnode falls back to returning a random value in that case, which is not what we want.