Merge lp:~alsuren/lava-test/trivia into lp:lava-test/0.0

[Paul Larson]

Some random cleanups from Collabora

[Paul Larson (pwlars)]

+1, but I'll probably go ahead and correct the error message there to reflect the name change

review: Approve

[lp:~alsuren/lava-test/trivia]

81. By Paul Larson on 2011-07-26

Some random fixes from Collabora to prepare for inclusion of insanity
test suite

=== modified file 'abrek/dashboard.py'
--- abrek/dashboard.py	2011-04-19 16:56:13 +0000
+++ abrek/dashboard.py	2011-07-26 17:14:50 +0000
@@ -142,9 +142,9 @@
             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 'abrek 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-26 17:14:50 +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}