am 81cdd6c6: am 1b46b2fe: Fix insertkeys.py to resolve keys.conf path entries in a portable way

* commit '81cdd6c6b7979baf30c4ae12421ece70ea9628ea':
  Fix insertkeys.py to resolve keys.conf path entries in a portable way
This commit is contained in:
Richard Haines 2013-08-20 14:05:47 -07:00 committed by Android Git Automerger
commit 7d7ab56e7d

View file

@ -87,7 +87,8 @@ class ParseConfig(ConfigParser.ConfigParser):
if tag in keyMap:
sys.exit("Duplicate tag detected " + tag)
path = os.path.join(key_directory, self.get(tag, option))
tag_path = os.path.expandvars(self.get(tag, option))
path = os.path.join(key_directory, tag_path)
keyMap[tag] = GenerateKeys(path)