storage:util:upgrade: use YAML parser to get BE Tree 1 0 settings
authorW. Trevor King <wking@tremily.us>
Sat, 27 Oct 2012 16:27:16 +0000 (12:27 -0400)
committerW. Trevor King <wking@tremily.us>
Sat, 27 Oct 2012 16:27:16 +0000 (12:27 -0400)
This fixes the "Bugs Everywhere Tree 1 0" -> "Bugs Everywhere
Directory v1.1" upgrade broken by the switch to JSON in:

  commit a95915c6c7d6a4e29c1e5547580e0c1fed2467e1
  Author: W. Trevor King <wking@tremily.us>
  Date:   Mon Sep 17 08:14:21 2012 -0400

    storage:util:mapfile: convert YAML settings to JSON.

libbe/storage/util/upgrade.py

index 98091f2c31261d256f6c986b1fd4effde7484806..ddc434a75fd3c4cc8b7b1174d7ad6cee20594cbd 100644 (file)
@@ -214,7 +214,7 @@ class Upgrade_1_0_to_1_1 (Upgrader):
                 path_list = c_path + [comment_uuid, 'values']
                 path = self.get_path(*path_list)
                 self._upgrade_mapfile(path)
-                settings = mapfile.parse(
+                settings = parse_yaml_mapfile(
                     encoding.get_file_contents(path))
                 if 'From' in settings:
                     settings['Author'] = settings.pop('From')