From patchwork Tue Aug 13 12:28:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stevan Radakovic X-Patchwork-Id: 19052 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-gh0-f198.google.com (mail-gh0-f198.google.com [209.85.160.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id F193224687 for ; Tue, 13 Aug 2013 12:28:34 +0000 (UTC) Received: by mail-gh0-f198.google.com with SMTP id r13sf619681ghr.5 for ; Tue, 13 Aug 2013 05:28:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-gm-message-state:delivered-to:mime-version:to:from:subject :message-id:date:reply-to:sender:errors-to:precedence :x-original-sender:x-original-authentication-results:mailing-list :list-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=DQcfB40Co9PDQQ1G6eLVTmn2zt+umX2lgJ7DdGiqdWw=; b=VdFU1f95SA814WDEa2kllevVOJK3Mb9+JYKQ2A/L6TazzLtv1XKwRjZ/F8Uw7YnvyI SWyypssTcfr95veTns/7+I3b6mfW+u73WXqiPN4cvzL3l03kdaf4Pd7xPuJ0qqpyL8Jl kUohzyHr9g6XpyEs4JOvg5i47l001R9zyAz7LPvXCtanB1AxsWUjVmaHo9GcfRpZDn0P dinkpIgxXEzt+amrKvHxDVHKQGf4ewH+tYnZAqeRUIbi0B3dqn9lYTUItmbtbafVISZ6 HQCUu58P78v/wbZsGXER6dqdR1m7mEqswkS1d1sSqqi6ge7B1p/iUTzOIrk8fx3pbJc4 iYPw== X-Received: by 10.236.169.196 with SMTP id n44mr1626227yhl.9.1376396914402; Tue, 13 Aug 2013 05:28:34 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.61.135 with SMTP id p7ls4543qer.54.gmail; Tue, 13 Aug 2013 05:28:34 -0700 (PDT) X-Received: by 10.52.115.129 with SMTP id jo1mr80361vdb.63.1376396914291; Tue, 13 Aug 2013 05:28:34 -0700 (PDT) Received: from mail-vb0-f48.google.com (mail-vb0-f48.google.com [209.85.212.48]) by mx.google.com with ESMTPS id x7si9661263vdo.152.2013.08.13.05.28.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 13 Aug 2013 05:28:34 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.48 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.48; Received: by mail-vb0-f48.google.com with SMTP id w16so6549065vbf.7 for ; Tue, 13 Aug 2013 05:28:34 -0700 (PDT) X-Gm-Message-State: ALoCoQlt0iwpKmz7QykCxv2Et0c2NeEfNkUoZp+deVxIGIl01+dqrblxOA03iyM3eX/aNUtTE9cp X-Received: by 10.220.74.69 with SMTP id t5mr4263936vcj.18.1376396914200; Tue, 13 Aug 2013 05:28:34 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp150999vcz; Tue, 13 Aug 2013 05:28:33 -0700 (PDT) X-Received: by 10.14.42.1 with SMTP id i1mr2100539eeb.79.1376396913020; Tue, 13 Aug 2013 05:28:33 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id z6si6829686eey.103.2013.08.13.05.28.32 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 13 Aug 2013 05:28:33 -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; Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1V9DiC-0007aj-Gk for ; Tue, 13 Aug 2013 12:28:32 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 730EDE96D0 for ; Tue, 13 Aug 2013 12:28:32 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-server X-Launchpad-Branch: ~linaro-validation/lava-server/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 421 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-server/trunk] Rev 421: Fix top-level domain extraction from site name. Reviewed by milo. Message-Id: <20130813122832.5884.32294.launchpad@ackee.canonical.com> Date: Tue, 13 Aug 2013 12:28:32 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: list X-Generated-By: Launchpad (canonical.com); Revision="16723"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 0a85670d332d0b03641d4dbc24fb93561aeb6075 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: noreply@launchpad.net X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.48 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Merge authors: Stevan Radaković (stevanr) Related merge proposals: https://code.launchpad.net/~stevanr/lava-server/google-analytics-domain-fix/+merge/179716 proposed by: Stevan Radaković (stevanr) review: Approve - Milo Casagrande (milo) ------------------------------------------------------------ revno: 421 [merge] committer: Stevan Radakovic branch nick: trunk timestamp: Tue 2013-08-13 14:28:03 +0200 message: Fix top-level domain extraction from site name. Reviewed by milo. modified: google_analytics/templatetags/analytics.py --- lp:lava-server https://code.launchpad.net/~linaro-validation/lava-server/trunk You are subscribed to branch lp:lava-server. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-server/trunk/+edit-subscription === modified file 'google_analytics/templatetags/analytics.py' --- google_analytics/templatetags/analytics.py 2013-07-24 11:50:02 +0000 +++ google_analytics/templatetags/analytics.py 2013-08-12 14:28:57 +0000 @@ -46,7 +46,7 @@ t = loader.get_template('google_analytics/analytics_template.html') c = Context({ 'analytics_code': code, - 'domain': '.'.join(self.site.domain.split('.')[2:]) + 'domain': '.'.join(self.site.domain.split('.')[-2:]) }) return t.render(c) else: