Remove rebuilds from merges that do not use batch transactions
svn: r16097
This commit is contained in:
		| @@ -244,4 +244,3 @@ class MergeEventQuery(object): | ||||
|         self.database.remove_event(old_handle, trans) | ||||
|         self.database.commit_event(self.phoenix, trans) | ||||
|         self.database.transaction_commit(trans, _("Merge Event Objects")) | ||||
|         self.database.emit('event-rebuild') | ||||
|   | ||||
| @@ -213,4 +213,3 @@ class MergeMediaQuery(object): | ||||
|         self.database.remove_object(old_handle, trans) | ||||
|         self.database.commit_media_object(self.phoenix, trans) | ||||
|         self.database.transaction_commit(trans, _("Merge Media Objects")) | ||||
|         self.database.emit('media-rebuild') | ||||
|   | ||||
| @@ -236,4 +236,3 @@ class MergeNoteQuery(object): | ||||
|         self.database.remove_note(old_handle, trans) | ||||
|         self.database.commit_note(self.phoenix, trans) | ||||
|         self.database.transaction_commit(trans, _("Merge Notes")) | ||||
|         self.database.emit('note-rebuild') | ||||
|   | ||||
| @@ -229,4 +229,3 @@ class MergePlaceQuery(object): | ||||
|         self.database.remove_place(old_handle, trans) | ||||
|         self.database.commit_place(self.phoenix, trans) | ||||
|         self.database.transaction_commit(trans, _("Merge Places")) | ||||
|         self.database.emit('place-rebuild') | ||||
|   | ||||
| @@ -179,4 +179,3 @@ class MergeRepoQuery(object): | ||||
|         self.database.remove_repository(old_handle, trans) | ||||
|         self.database.commit_repository(self.phoenix, trans) | ||||
|         self.database.transaction_commit(trans, _("Merge Repositories")) | ||||
|         self.database.emit('repository-rebuild') | ||||
|   | ||||
| @@ -236,4 +236,3 @@ class MergeSourceQuery(object): | ||||
|         self.database.remove_source(old_handle, trans) | ||||
|         self.database.commit_source(self.phoenix, trans) | ||||
|         self.database.transaction_commit(trans, _("Merge Sources")) | ||||
|         self.database.emit('source-rebuild') | ||||
|   | ||||
		Reference in New Issue
	
	Block a user