← Back to branch summary

~matsubara/charms/trusty/mysql/bug-1410847

« back to all changes in this revision

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

  • Committer: Liam Young
  • Date: 2014-10-22 14:38:57 UTC
  • mto: This revision was merged to the branch mainline in revision 129.
  • Revision ID: liam.young@canonical.com-20141022143857-a515pvsxlak5l36l
Sync charmhelpers to make distro a valid cource option again

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/core/hookenv.py
214
214
        except KeyError:
215
215
            return (self._prev_dict or {})[key]
216
216
 
 
217
    def keys(self):
 
218
        prev_keys = []
 
219
        if self._prev_dict is not None:
 
220
            prev_keys = self._prev_dict.keys()
 
221
        return list(set(prev_keys + dict.keys(self)))
 
222
 
217
223
    def load_previous(self, path=None):
218
224
        """Load previous copy of config from disk.
219
225