[Piuparts-commits] [SCM] piuparts git repository branch, piatti, updated. 0.48-19-g93bfc2b

[Andreas Beckmann]

The following commit has been merged in the piatti branch:
commit 68798f27791ce7feb10bce3d48997821aafe995f
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Fri Nov 30 15:56:47 2012 +0100

    p-s: disable X forwarding while connecting to master
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/debian/changelog b/debian/changelog
index 5b835de..be3f742 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ piuparts (0.49) UNRELEASED; urgency=low
   * piuparts.conf:
   * piuparts-master.py:
   * piuparts-slave.py:
+    - Disable X forwarding while connecting to master.
   * piuparts-report.py:
     - Hardlink the logfiles to the htdocs tree (with copy as fallback).
   * New bug template: partial-upgrade-file-overwrite.
diff --git a/piuparts-slave.py b/piuparts-slave.py
index 104d32c..f63f5e3 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -202,7 +202,7 @@ class Slave:
         ssh_cmdline = "cd %s; %s 2> %s.$$ && rm %s.$$" % \
                       (self._master_directory or ".",
                       self._master_command, log_file, log_file)
-        p = subprocess.Popen(["ssh", user + self._master_host, ssh_cmdline],
+        p = subprocess.Popen(["ssh", "-x", user + self._master_host, ssh_cmdline],
                        stdin=subprocess.PIPE, stdout=subprocess.PIPE)
         self._to_master = p.stdin
         self._from_master = p.stdout

-- 
piuparts git repository