Lines 214, 219, and 247 of the merge look like leftover bzr merge lines. Those are all in utah/provisioning/inventory/sqlite.py I wonder if lines 215-218 are still needed as well, as they would seem to be superseded by the lines after that.
Other than that, it looks like it should improve things a lot. If we do decide to start using rotating file handlers instead of external log rotation, this will make that a lot easier as well.
Lines 214, 219, and 247 of the merge look like leftover bzr merge lines. Those are all in utah/provisioni ng/inventory/ sqlite. py I wonder if lines 215-218 are still needed as well, as they would seem to be superseded by the lines after that.
Other than that, it looks like it should improve things a lot. If we do decide to start using rotating file handlers instead of external log rotation, this will make that a lot easier as well.