coreos/dev-util — pull request #12 by burke (2014-05-23 04:21:55+00:00)
Title: fix(gmerge): Fix KeyError handling when update.conf invalid

### Before:
```
core@localhost ~ $ /usr/bin/gmerge coreos-base/update_engine
Traceback (most recent call last):
File "/usr/bin/gmerge", line 136, in
main()
File "/usr/bin/gmerge", line 121, in main
merger = GMerger(conf_data)
File "/usr/bin/gmerge", line 31, in __init__
sys.exit('Could not find /etc/coreos/update.conf value: ' + e)
TypeError: cannot concatenate 'str' and 'exceptions.KeyError' objects
```

### After:
```
core@localhost ~ $ ./gmerge coreos-base/update_engine
Could not find /etc/coreos/update.conf value: DEVSERVER
```

Note also that [the docs](https://coreos.com/docs/sdk-distributors/sdk/building-development-images/) say gmerge is located at `/usr/local/bin/gmerge`, but it's installed to `/usr/bin/gmerge`.