← Back to branch summary

~gnuoy/charms/trusty/ceph/1453940-stable

« back to all changes in this revision

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

  • Committer: Liam Young
  • Date: 2014-11-26 09:07:27 UTC
  • Revision ID: liam.young@canonical.com-20141126090727-v6d8k6dkm34zn0ka
Sync charmhelpers

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/core/hookenv.py
223
223
        prev_keys = []
224
224
        if self._prev_dict is not None:
225
225
            prev_keys = self._prev_dict.keys()
226
 
        return list(set(prev_keys + dict.keys(self)))
 
226
        return list(set(prev_keys + list(dict.keys(self))))
227
227
 
228
228
    def load_previous(self, path=None):
229
229
        """Load previous copy of config from disk.