From patchwork Fri Jun 17 04:41:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael-Doyle Hudson X-Patchwork-Id: 2022 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 792E223E54 for ; Fri, 17 Jun 2011 04:41:31 +0000 (UTC) Received: from mail-vx0-f180.google.com (mail-vx0-f180.google.com [209.85.220.180]) by fiordland.canonical.com (Postfix) with ESMTP id 3C27CA18A59 for ; Fri, 17 Jun 2011 04:41:31 +0000 (UTC) Received: by vxd7 with SMTP id 7so30367vxd.11 for ; Thu, 16 Jun 2011 21:41:30 -0700 (PDT) Received: by 10.52.98.97 with SMTP id eh1mr2487151vdb.7.1308285690667; Thu, 16 Jun 2011 21:41:30 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.52.183.130 with SMTP id em2cs227291vdc; Thu, 16 Jun 2011 21:41:30 -0700 (PDT) Received: by 10.227.24.146 with SMTP id v18mr1628063wbb.84.1308285689531; Thu, 16 Jun 2011 21:41:29 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id ek19si1959179wbb.69.2011.06.16.21.41.29; Thu, 16 Jun 2011 21:41:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) client-ip=91.189.90.139; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) smtp.mail=bounces@canonical.com Received: from loganberry.canonical.com ([91.189.90.37]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1QXQs3-0002yR-KA for ; Fri, 17 Jun 2011 04:41:28 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 797CC2E84FB for ; Fri, 17 Jun 2011 04:41:23 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-tool X-Launchpad-Branch: ~linaro-validation/lava-tool/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 155 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-tool/trunk] Rev 155: oops * 2 Message-Id: <20110617044123.7556.95402.launchpad@loganberry.canonical.com> Date: Fri, 17 Jun 2011 04:41:23 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13242"; Instance="initZopeless config overlay" X-Launchpad-Hash: cd475f27f7813267fa9d0b9f493bb9d514219fa2 ------------------------------------------------------------ revno: 155 committer: Michael-Doyle Hudson branch nick: trunk timestamp: Fri 2011-06-17 16:35:17 +1200 message: oops * 2 modified: lava_tool/commands/auth.py --- lp:lava-tool https://code.launchpad.net/~linaro-validation/lava-tool/trunk You are subscribed to branch lp:lava-tool. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-tool/trunk/+edit-subscription === modified file 'lava_tool/commands/auth.py' --- lava_tool/commands/auth.py 2011-06-14 01:30:55 +0000 +++ lava_tool/commands/auth.py 2011-06-17 04:35:17 +0000 @@ -99,10 +99,12 @@ else: token = getpass.getpass("Paste token for %s: " % uri) + userless_uri = '%s://%s%s' % (parsed_host.scheme, host, parsed_host.path) + if not self.args.no_check: sp = AuthenticatingServerProxy( uri, auth_backend=MemoryAuthBackend( - [(username, host, token)])) + [(username, userless_uri, token)])) try: token_user = sp.system.whoami() except xmlrpclib.ProtocolError as ex: @@ -119,7 +121,6 @@ "whoami() returned %s rather than expected %s -- this is " "a bug." % (token_user, username)) - userless_uri = '%s://%s%s' % (parsed_host.scheme, host, parsed_host.path) self.auth_backend.add_token(username, userless_uri, token) print 'Token added successfully for user %s.' % username