python-blivet/0001-Use-correct-type-for-port-in-GVariant-tuple.patch
David Lehman 0d7a83bf90 Fixes for F25 blockers and freeze exceptions.
- Use correct type for port in GVariant tuple (awilliam)
- iSCSI: Store auth info in NodeInfo tuples (awilliam)
- iSCSI: turn `iscsi.initiator_set` into a property (awilliam)
- Add device symlinks to the PVs dictionary for MD RAID PVs (#1389130) (vpodzime)
2016-11-07 12:10:56 -05:00

29 lines
993 B
Diff

From cf32290dd3a0561585837fddfcdb08b3389f356a Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Wed, 26 Oct 2016 16:17:46 -0700
Subject: [PATCH 1/4] Use correct type for port in GVariant tuple
The type is `(sqa{sv})`, where `q` (according to the docs) is
"an unsigned 16 bit integer", so this should be an int, not a
string.
---
blivet/iscsi.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/blivet/iscsi.py b/blivet/iscsi.py
index 8773509..14c4b9a 100644
--- a/blivet/iscsi.py
+++ b/blivet/iscsi.py
@@ -369,7 +369,7 @@ class iSCSI(object):
if r_password:
auth_info["r_password"] = GLib.Variant("s", r_password)
- args = GLib.Variant("(sqa{sv})", (ipaddr, port, auth_info))
+ args = GLib.Variant("(sqa{sv})", (ipaddr, int(port), auth_info))
nodes, _n_nodes = self._call_initiator_method("DiscoverSendTargets", args)
found_nodes = _to_node_infos(nodes)
--
2.7.4