From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 7 Dec 2014 15:21:58 +0000 (+0100)
Subject: ud-replicated: only restore TERM if it was set before.  If it wasn't leave it at... 
X-Git-Tag: userdir-ldap-0.3.88~41
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=737d99f5901e163b9a62ed60f7fa4ae1ca13822a

ud-replicated: only restore TERM if it was set before.  If it wasn't leave it at dumb.
---

diff --git a/debian/changelog b/debian/changelog
index dd8cf77..c508263 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 userdir-ldap (0.3.86) UNRELEASED; urgency=medium
 
   * ud-generate: support ssh-ed25519 keys for SSHFP records.
+  * ud-replicated: only restore TERM if it was set before.  If it wasn't leave
+    it at dumb.
 
- -- Peter Palfrader <weasel@debian.org>  Sun, 07 Dec 2014 10:47:17 +0100
+ -- Peter Palfrader <weasel@debian.org>  Sun, 07 Dec 2014 16:21:24 +0100
 
 userdir-ldap (0.3.85) unstable; urgency=low
 
diff --git a/ud-replicated b/ud-replicated
index 7aa8b89..dd58a24 100755
--- a/ud-replicated
+++ b/ud-replicated
@@ -104,7 +104,8 @@ def do_replicate(message):
         else:
             LOG.debug('%s finished with ret: 0' % ' '.join(command))
         finally:
-            os.environ['TERM'] = old_term
+            if old_term is not None:
+                os.environ['TERM'] = old_term
     last_run = last_update
 
 def main():