Attachment 874516 Details for Bug 1075691 – Proposed patch

[patch] Proposed patch

fix_identity.patch (text/plain), 1.19 KB, created by Marek Grac on 2014-03-14 16:33:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marek Grac

Created: 2014-03-14 16:33:05 UTC

Size: 1.19 KB

patch

obsolete

>diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
>index 576140e..244515f 100644
>--- a/fence/agents/lib/fencing.py.py
>+++ b/fence/agents/lib/fencing.py.py
>@@ -946,11 +946,11 @@ def fence_login(options, re_login_string = "(login\s*: )|(Login Name:  )|(userna
> 				"are not in the spec file and must be installed separately." + "\n")
> 				sys.exit(EC_GENERIC_ERROR)
> 
>-			result = conn.log_expect(options, [ options["-c"], "Are you sure you want to continue connecting (yes/no)?", "Enter passphrase for key '"+options["-k"]+"':" ], int(options["-y"]))
>+			result = conn.log_expect(options, [ "Enter passphrase for key '"+options["-k"]+"':", "Are you sure you want to continue connecting (yes/no)?" ] + options["-c"], int(options["-y"]))
> 			if result == 1:
> 				conn.sendline("yes")
>-				conn.log_expect(options, [ options["-c"], "Enter passphrase for key '"+options["-k"]+"':"] , int(options["-y"]))
>-			if result != 0:
>+				conn.log_expect(options, [ "Enter passphrase for key '"+options["-k"]+"':"] + options["-c"] , int(options["-y"]))
>+			if result == 0:
> 				if options.has_key("-p"):
> 					conn.sendline(options["-p"])
> 					conn.log_expect(options, options["-c"], int(options["-y"]))

Actions: View | Diff

Attachments on bug 1075691: 874516