[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
State Accepted
Headers show

Commit Message

Paul Larson July 26, 2011, 5:19 p.m.
Merge authors:
  David Laban <alsuren@alsuren-thinkpad.cbg.collabora.co.uk>
  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 <paul.larson@canonical.com>
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

Patch

=== 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}