[dak/master] Revert "Merge branch 'merge'"

[Joerg Jaspert <joerg@debian.org>]

This reverts commit 16f020f22ddc10b88ee076f2ac86d33cbc7769e5.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
 daklib/binary.py |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/daklib/binary.py b/daklib/binary.py
index a2601a7..042cd26 100755
--- a/daklib/binary.py
+++ b/daklib/binary.py
@@ -133,8 +133,6 @@ class Binary(object):
         rejected = not self.valid_deb()
         self.__unpack()
 
-        result = False
-
         if not rejected and self.tmpdir:
             cwd = os.getcwd()
             try:
@@ -149,17 +147,18 @@ class Binary(object):
                     data = tarfile.open(os.path.join(self.tmpdir, "data.tar.bz2" ), "r:bz2")
 
                 if bootstrap_id:
-                    result = DBConn().insert_content_paths(bootstrap_id, [ tarinfo.name for tarinfo in data if not tarinfo.isdir()])
+                    return DBConn().insert_content_paths(bootstrap_id, [ tarinfo.name for tarinfo in data if not tarinfo.isdir()])
                 else:
                     pkg = deb822.Packages.iter_paragraphs( control.extractfile('./control') ).next()
-                    result = DBConn().insert_pending_content_paths(pkg, [ tarinfo.name for tarinfo in data if not tarinfo.isdir()])
+                    return DBConn().insert_pending_content_paths(pkg, [ tarinfo.name for tarinfo in data if not tarinfo.isdir()])
 
             except:
                 traceback.print_exc()
-                result = False
 
-        os.chdir( cwd )
-        return result
+                return False
+
+            finally:
+                os.chdir( cwd )
 
 if __name__ == "__main__":
     Binary( "/srv/ftp.debian.org/queue/accepted/halevt_0.1.3-2_amd64.deb" ).scan_package()
-- 
1.5.6.5