From 6f9aabc55e1f12a83f344eaed1e71829a219b9e7 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Mon, 17 Oct 2011 09:43:09 +0200 Subject: [PATCH] [eit.commands.branch] make branch switching more atomic --- server/eit/commands/branch.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/server/eit/commands/branch.py b/server/eit/commands/branch.py index 92cb54160..d40e5b3a8 100644 --- a/server/eit/commands/branch.py +++ b/server/eit/commands/branch.py @@ -128,11 +128,15 @@ class EitBranch(EitCommand): # set branch to new branch first entropy_server.set_branch(self._to_branch) - status = entropy_server._switch_packages_branch( - repository_id, from_branch, self._to_branch) - if status is None: - entropy_server.set_branch(from_branch) - return 1 + status = None + try: + status = entropy_server._switch_packages_branch( + repository_id, from_branch, self._to_branch) + if status is None: + return 1 + finally: + if status is None: + entropy_server.set_branch(from_branch) switched, already_switched, ignored, \ not_found, no_checksum = status