From 484853e39216e15b0de5ca6fd7906b5f294e8e4d Mon Sep 17 00:00:00 2001 From: Tim Laszlo Date: Wed, 17 Oct 2012 11:48:46 -0500 Subject: Revert "migrate_db: skip db lookup since all should be known" This caused data duplication on migration. This reverts commit 9707ee8e4c495133f329000d3e5b89d8b84e5998. Conflicts: src/lib/Bcfg2/Reporting/models.py --- tools/upgrade/1.3/migrate_dbstats.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tools') diff --git a/tools/upgrade/1.3/migrate_dbstats.py b/tools/upgrade/1.3/migrate_dbstats.py index bbe74cab2..888abc002 100755 --- a/tools/upgrade/1.3/migrate_dbstats.py +++ b/tools/upgrade/1.3/migrate_dbstats.py @@ -107,14 +107,14 @@ def _migrate_transaction(inter, entries, fperms): act_dict['status'] = "check" act_dict['output'] = -1 logger.debug("Adding action %s" % name) - updates['actions'].append(new_models.ActionEntry.entry_get_or_create(act_dict, skip_fetch=1)) + updates['actions'].append(new_models.ActionEntry.entry_get_or_create(act_dict)) elif ent.kind == 'Package': act_dict['target_version'] = ei.reason.version act_dict['current_version'] = ei.reason.current_version logger.debug("Adding package %s %s" % (name, act_dict['target_version'])) - updates['packages'].append(new_models.PackageEntry.entry_get_or_create(act_dict, skip_fetch=1)) + updates['packages'].append(new_models.PackageEntry.entry_get_or_create(act_dict)) elif ent.kind == 'Path': # these might be hard.. they aren't one to one with the old model act_dict['path_type'] = 'file' @@ -136,7 +136,7 @@ def _migrate_transaction(inter, entries, fperms): act_dict['target_path'] = ei.reason.to act_dict['current_path'] = ei.reason.current_to logger.debug("Adding link %s" % name) - updates['paths'].append(new_models.LinkEntry.entry_get_or_create(act_dict, skip_fetch=1)) + updates['paths'].append(new_models.LinkEntry.entry_get_or_create(act_dict)) continue act_dict['detail_type'] = new_models.PathEntry.DETAIL_UNUSED @@ -156,13 +156,13 @@ def _migrate_transaction(inter, entries, fperms): act_dict['detail_type'] = new_models.PathEntry.DETAIL_DIFF act_dict['details'] = ei.reason.current_diff logger.debug("Adding path %s" % name) - updates['paths'].append(new_models.PathEntry.entry_get_or_create(act_dict, skip_fetch=1)) + updates['paths'].append(new_models.PathEntry.entry_get_or_create(act_dict)) elif ent.kind == 'Service': act_dict['target_status'] = ei.reason.status act_dict['current_status'] = ei.reason.current_status logger.debug("Adding service %s" % name) - updates['services'].append(new_models.ServiceEntry.entry_get_or_create(act_dict, skip_fetch=1)) + updates['services'].append(new_models.ServiceEntry.entry_get_or_create(act_dict)) else: logger.warn("Skipping type %s" % ent.kind) -- cgit v1.2.3-1-g7c22