Checkbox

Merge lp:~bladernr/checkbox/fix-virt-no-config-warning into lp:checkbox

  1. fix-virt-no-config-warning
  2. Merge into trunk
Proposed by Jeff Lane 
Status: Merged
Approved by: Po-Hsu Lin
Approved revision: 4360
Merged at revision: 4361
Proposed branch: lp:~bladernr/checkbox/fix-virt-no-config-warning
Merge into: lp:checkbox
Diff against target: 22 lines (+3/-2)
1 file modified
providers/plainbox-provider-checkbox/bin/virtualization (+3/-2)
To merge this branch: bzr merge lp:~bladernr/checkbox/fix-virt-no-config-warning
Reviewer Review Type Date Requested Status
Po-Hsu Lin Approve
Review via email: mp+295122@code.launchpad.net

Description of the change

Changed DEFAULT_CFG location to /etc/xdg since we no longer create /etc/checkbox.d.

Modified No Config File warnings to be more informative. People were confused by the messaging.

To post a comment you must log in.
Revision history for this message
Po-Hsu Lin (cypressyew) wrote :

LGTM, +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'providers/plainbox-provider-checkbox/bin/virtualization'
2--- providers/plainbox-provider-checkbox/bin/virtualization 2016-04-22 20:00:30 +0000
3+++ providers/plainbox-provider-checkbox/bin/virtualization 2016-05-18 19:05:28 +0000
4@@ -410,7 +410,7 @@
5 def test_kvm(args):
6 print("Executing KVM Test", file=sys.stderr)
7
8- DEFAULT_CFG = "/etc/checkbox.d/virtualization.cfg"
9+ DEFAULT_CFG = "/etc/xdg/virtualization.cfg"
10 image = ""
11 timeout = ""
12
13@@ -422,7 +422,8 @@
14 try:
15 config.readfp(open(config_file))
16 except IOError:
17- logging.warn("No config file found")
18+ logging.warn("Config file %s was not found" % DEFAULT_CFG)
19+ logging.warn("Now looking for ENV variables and command line arguments instead")
20 else:
21 try:
22 timeout = config.getfloat("KVM", "timeout")

Subscribers

People subscribed via source and target branches