From patchwork Fri Jun 22 01:26:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael-Doyle Hudson X-Patchwork-Id: 9538 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 96A8123DEB for ; Fri, 22 Jun 2012 01:26:15 +0000 (UTC) Received: from mail-gh0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id 5B8F0A1804D for ; Fri, 22 Jun 2012 01:26:15 +0000 (UTC) Received: by ghbz12 with SMTP id z12so1265153ghb.11 for ; Thu, 21 Jun 2012 18:26:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :content-type:mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state; bh=Ws7zQoWvFVfldgYoEF4ZGHY0lgwQMZ6DitNvtxIcsCs=; b=G8BgeNIMKJG4GKroHz10QSfKTa/lBTzOgEYAoW6v/GVdCgj0wDnw9374G416CRuNLz CBT5sLAoDfirn+cBKaI1XCDkUjHcterLBuzVRzaDWnD2zBuU6VO+JTeHWtjEwXwTAnvE Sqohv9AXmxaznwC4XHutbA2q2RVVZejmPcUdbCeRtIQQ1SVWA+saRrpF3d48JI4zzWrS EDStcYcalFO/4m6NN5FVP8+PGor0T9tHTUojBo5W1Ft3JexAOB/1+Eg2ITJh+ghnZVly 1v6fYIfMzPr2i/i1hhQR90jJkj6gjADRl0WpL9dlTLZLoe4r3pgk+zSDBHfucuQYhhog D72w== Received: by 10.50.203.39 with SMTP id kn7mr119114igc.53.1340328374563; Thu, 21 Jun 2012 18:26:14 -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.231.24.148 with SMTP id v20csp46241ibb; Thu, 21 Jun 2012 18:26:13 -0700 (PDT) Received: by 10.216.213.79 with SMTP id z57mr164129weo.27.1340328373052; Thu, 21 Jun 2012 18:26:13 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id fa8si640468wib.3.2012.06.21.18.26.11 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 21 Jun 2012 18:26:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1ShsdX-0007In-Mj for ; Fri, 22 Jun 2012 01:26:11 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id A0B81E00B5 for ; Fri, 22 Jun 2012 01:26:11 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-dispatcher X-Launchpad-Branch: ~linaro-validation/lava-dispatcher/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 331 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 331: preserve the port in the dashboard url when building the MemoryAuthBackend for submission Message-Id: <20120622012611.1046.17130.launchpad@ackee.canonical.com> Date: Fri, 22 Jun 2012 01:26:11 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="15459"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 7872cd2cbc44dbd077bcc95d7f1a3ad96f17952a X-Gm-Message-State: ALoCoQlw2N8CER0H49TKi1RORXBy/m6NTnb6sngZJFb2LmNabextJrDn6UZUabdFmlRWNRu9ftgK ------------------------------------------------------------ revno: 331 committer: Michael Hudson-Doyle branch nick: trunk timestamp: Fri 2012-06-22 13:25:13 +1200 message: preserve the port in the dashboard url when building the MemoryAuthBackend for submission modified: lava_dispatcher/actions/launch_control.py --- lp:lava-dispatcher https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk You are subscribed to branch lp:lava-dispatcher. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk/+edit-subscription === modified file 'lava_dispatcher/actions/launch_control.py' --- lava_dispatcher/actions/launch_control.py 2012-05-08 18:05:52 +0000 +++ lava_dispatcher/actions/launch_control.py 2012-06-22 01:25:13 +0000 @@ -47,8 +47,11 @@ auth_backend = MemoryAuthBackend([]) if parsed_server.username: if token: - userless_server = '%s://%s%s' % ( - parsed_server.scheme, parsed_server.hostname, parsed_server.path) + userless_server = '%s://%s' % ( + parsed_server.scheme, parsed_server.hostname) + if parsed_server.port: + userless_server += ':' + str(parsed_server.port) + userless_server += parsed_server.path auth_backend = MemoryAuthBackend([(parsed_server.username, userless_server, token)]) else: logging.warn(