From 2a0f93726b7bcef46920a1f478b9b2a6d9023947 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Fri, 31 Dec 2010 13:08:16 +0100
Subject: [PATCH] Fix build errors with ganeti-listrunner

- Remove non-ASCII character from manpage
- Reformat docstring for epydoc in script

These caused build breakage on some but not all distributions.

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
 man/ganeti-listrunner.rst |  2 +-
 tools/ganeti-listrunner   | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/man/ganeti-listrunner.rst b/man/ganeti-listrunner.rst
index ce8086aa1..bfa0cad7f 100644
--- a/man/ganeti-listrunner.rst
+++ b/man/ganeti-listrunner.rst
@@ -30,7 +30,7 @@ authentication or Kerberos authentication is not available.
 
 It can run either a command or a script (which gets uploaded first and deleted
 after execution) on a  list  of hosts provided either via a file (one host per
-line) or as a comma-separated list on the commandline. The out‐ put (stdout and
+line) or as a comma-separated list on the commandline. The output (stdout and
 stderr are merged) of the remote execution is written to a logfile. One logfile
 per  host  is written.
 
diff --git a/tools/ganeti-listrunner b/tools/ganeti-listrunner
index 72b4266b2..fba0b75f9 100644
--- a/tools/ganeti-listrunner
+++ b/tools/ganeti-listrunner
@@ -354,15 +354,14 @@ def HostWorker(logdir, username, password, keys, hostname,
   which exit at the end of this function. The exit code 0 or 1 will be
   interpreted by the parent.
 
-  Args:
-    logdir: the directory where the logfiles must be created
-    username: SSH username
-    password: SSH password
-    keys: SSH keys
-    hostname: the hostname to connect to
-    executable: the executable to upload, if not None
-    command: the command to run
-    filelist: auxiliary files to upload
+  @param logdir: the directory where the logfiles must be created
+  @param username: SSH username
+  @param password: SSH password
+  @param keys: SSH keys
+  @param hostname: the hostname to connect to
+  @param executable: the executable to upload, if not None
+  @param command: the command to run
+  @param filelist: auxiliary files to upload
 
   """
   # in the child/worker process
-- 
GitLab