← Back to branch summary

~1chb1n/charms/trusty/nova-compute/next.normalize-makefile-test-deps

« back to all changes in this revision

Viewing changes to hooks/charmhelpers/core/unitdata.py

  • Committer: james.page at ubuntu
  • Date: 2015-03-31 15:01:48 UTC
  • mfrom: (116 nova-compute)
  • mto: This revision was merged to the branch mainline in revision 117.
  • Revision ID: james.page@ubuntu.com-20150331150148-fn3iawy9bqboe0d3
Rebase, resync

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/core/unitdata.py
443
443
        data = hookenv.execution_environment()
444
444
        self.conf = conf_delta = self.kv.delta(data['conf'], 'config')
445
445
        self.rels = rels_delta = self.kv.delta(data['rels'], 'rels')
446
 
        self.kv.set('env', data['env'])
 
446
        self.kv.set('env', dict(data['env']))
447
447
        self.kv.set('unit', data['unit'])
448
448
        self.kv.set('relid', data.get('relid'))
449
449
        return conf_delta, rels_delta