From jlukens@botch.com Thu Jul 10 04:11:52 2014 Received: (at submit) by bugs.x2go.org; 10 Jul 2014 02:11:53 +0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on ymir.das-netzwerkteam.de X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=ham version=3.3.2 Received: from felt.botch.com (felt.botch.com [207.145.43.98]) by ymir.das-netzwerkteam.de (Postfix) with ESMTP id 1AE715DB24 for ; Thu, 10 Jul 2014 04:11:52 +0200 (CEST) Received: from [127.0.0.1] (unknown [192.168.254.1]) (Authenticated sender: jlukens) by felt.botch.com (Postfix) with ESMTP id 7813B1AC0CB for ; Wed, 9 Jul 2014 22:10:33 -0400 (EDT) Date: Wed, 9 Jul 2014 22:10:16 -0400 From: Josh Lukens To: submit@bugs.x2go.org Message-ID: <974011BF755047D082CA0577DF5B2E47@botch.com> Subject: find_busy_servers in agent.py does not return tuple expected as part of recent API change X-Mailer: sparrow 1.6.4 (build 1178) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="53bdf608_379e21b5_8ead" --53bdf608_379e21b5_8ead Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Package: x2gobroker Version: 0.0.3.0 Severity: wishlist find_busy_servers in agent.py does not return tuple expected as part of recent API change. This breaks use of session broker in cases where more than one server is specified in a profile. Draft patch attached. --53bdf608_379e21b5_8ead Content-Type: application/octet-stream Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="agent-fix.patch" ZGlmZiAtLWdpdCBhL3gyZ29icm9rZXIvYWdlbnQucHkgYi94MmdvYnJva2VyL2FnZW50LnB5Cmlu ZGV4IDljYjY0NWEuLjJiNmE4NzMgMTAwNjQ0Ci0tLSBhL3gyZ29icm9rZXIvYWdlbnQucHkKKysr IGIveDJnb2Jyb2tlci9hZ2VudC5weQpAQCAtMzM3LDEyICszMzcsMTUgQEAgZGVmIGZpbmRfYnVz eV9zZXJ2ZXJzKHVzZXJuYW1lLCByZW1vdGVfYWdlbnQ9Tm9uZSwgKiprd2FyZ3MpOgogCiAgICAg aWYgc2VydmVyX2xpc3Q6CiAgICAgICAgIGlmIHR5cGUoc2VydmVyX2xpc3QpIGlzIHR5cGVzLkxp c3RUeXBlOgorICAgICAgICAgICAgX3N1Y2Nlc3MgPSBUcnVlCiAgICAgICAgICAgICBmb3Igc2Vy dmVyX2l0ZW0gaW4gc2VydmVyX2xpc3Q6CiAgICAgICAgICAgICAgICAgaWYgJzonIGluIHNlcnZl cl9pdGVtOgogICAgICAgICAgICAgICAgICAgICB1c2FnZSwgc2VydmVyID0gc2VydmVyX2l0ZW0u c3BsaXQoJzonKQogICAgICAgICAgICAgICAgICAgICBzZXJ2ZXJfdXNhZ2UudXBkYXRlKHsgc2Vy dmVyOiBpbnQodXNhZ2UpIH0pCisgICAgZWxzZToKKyAgICAgICAgX3N1Y2Nlc3MgPSBGYWxzZQog Ci0gICAgcmV0dXJuIHNlcnZlcl91c2FnZQorICAgIHJldHVybiAoX3N1Y2Nlc3MsIHNlcnZlcl91 c2FnZSkKIHRhc2tzWydmaW5kYnVzeXNlcnZlcnMnXSA9IGZpbmRfYnVzeV9zZXJ2ZXJzCiAKIAo= --53bdf608_379e21b5_8ead--