From patchwork Tue Jul 26 17:19:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Larson X-Patchwork-Id: 3160 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 39A0C24142 for ; Tue, 26 Jul 2011 17:19:15 +0000 (UTC) Received: from mail-qw0-f52.google.com (mail-qw0-f52.google.com [209.85.216.52]) by fiordland.canonical.com (Postfix) with ESMTP id 03631A1874A for ; Tue, 26 Jul 2011 17:19:14 +0000 (UTC) Received: by qwb8 with SMTP id 8so472908qwb.11 for ; Tue, 26 Jul 2011 10:19:14 -0700 (PDT) Received: by 10.229.1.217 with SMTP id 25mr2285637qcg.38.1311700754449; Tue, 26 Jul 2011 10:19: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.229.217.78 with SMTP id hl14cs120431qcb; Tue, 26 Jul 2011 10:19:14 -0700 (PDT) Received: by 10.227.37.149 with SMTP id x21mr3241581wbd.35.1311700753460; Tue, 26 Jul 2011 10:19:13 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id fm6si1312404wbb.42.2011.07.26.10.19.13; Tue, 26 Jul 2011 10:19:13 -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 1QllHk-0003fN-UA for ; Tue, 26 Jul 2011 17:19:12 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id DE0902E84F6 for ; Tue, 26 Jul 2011 17:19:12 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-test X-Launchpad-Branch: ~linaro-validation/lava-test/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 81 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-test/trunk] Rev 81: Some random fixes from Collabora to prepare for inclusion of insanity Message-Id: <20110726171912.13688.24403.launchpad@loganberry.canonical.com> Date: Tue, 26 Jul 2011 17:19:12 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13503"; Instance="initZopeless config overlay" X-Launchpad-Hash: 40cf37175f52582b25dca4a30f71dba1d0ab79d5 Merge authors: David Laban Paul Larson (pwlars) Related merge proposals: https://code.launchpad.net/~alsuren/lava-test/trivia/+merge/69327 proposed by: Paul Larson (pwlars) review: Approve - Paul Larson (pwlars) ------------------------------------------------------------ revno: 81 [merge] committer: Paul Larson branch nick: lava-test timestamp: Tue 2011-07-26 12:17:30 -0500 message: Some random fixes from Collabora to prepare for inclusion of insanity test suite modified: abrek/dashboard.py abrek/swprofile.py --- lp:lava-test https://code.launchpad.net/~linaro-validation/lava-test/trunk You are subscribed to branch lp:lava-test. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-test/trunk/+edit-subscription === modified file 'abrek/dashboard.py' --- abrek/dashboard.py 2011-04-19 16:56:13 +0000 +++ abrek/dashboard.py 2011-07-26 17:16:42 +0000 @@ -142,9 +142,10 @@ hosturl = urllib.basejoin(db_config.host, "xml-rpc/") try: server = xmlrpclib.Server(hosturl) - except IOError: - print "Error connecting to server, please run 'abrek " \ - "dashboard setup [host]'" + except IOError, e: + print ("Error connecting to server at '%s'. Error was: %s, " + "please run 'lava-test dashboard setup [host]'" % ( + hosturl, e)) sys.exit(1) try: result = server.put(DocumentIO.dumps(bundle), result_name, === modified file 'abrek/swprofile.py' --- abrek/swprofile.py 2011-04-07 05:26:43 +0000 +++ abrek/swprofile.py 2011-07-22 04:00:04 +0000 @@ -60,6 +60,6 @@ name = buildstamp.splitlines()[1] except IOError: if lsb_information == None: - lsb_information = lsb_release.get_lsb_information() + lsb_information = lsb_release.get_distro_information() name = lsb_information['DESCRIPTION'] return {"name":name}