From: Philipp Kern <pkern@debian.org>
Date: Sun, 7 Sep 2008 19:48:53 +0000 (+0000)
Subject: wrap try..except..finally the python 2.4 way
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=dc5d7b44188e95d81eb5a43b41c5534dc2e552b0;p=dak.git

wrap try..except..finally the python 2.4 way

2008-09-07  Philipp Kern  <pkern@debian.org>

        * daklib/utils.py (check_hash): try..except..finally only
        works on python >=2.5.

Signed-off-by: Philipp Kern <pkern@debian.org>
---

diff --git a/ChangeLog b/ChangeLog
index a5469a1a..140b1dfd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-07  Philipp Kern  <pkern@debian.org>
+
+	* daklib/utils.py (check_hash): try..except..finally only
+	works on python >=2.5.
+
 2008-09-07  Philipp Kern  <pkern@debian.org>
 
 	* daklib/utils.py (check_hash): change the comment and warn
diff --git a/daklib/utils.py b/daklib/utils.py
index 8e06cf35..03135e72 100755
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -252,22 +252,23 @@ def check_hash(where, files, hashname, hashfunc):
     for f in files.keys():
         file_handle = None
         try:
-            file_handle = open_file(f)
-
-            # Check for the hash entry, to not trigger a KeyError.
-            if not files[f].has_key(hash_key(hashname)):
-                rejmsg.append("%s: misses %s checksum in %s" % (f, hashname,
-                    where))
+            try:
+                file_handle = open_file(f)
+    
+                # Check for the hash entry, to not trigger a KeyError.
+                if not files[f].has_key(hash_key(hashname)):
+                    rejmsg.append("%s: misses %s checksum in %s" % (f, hashname,
+                        where))
+                    continue
+    
+                # Actually check the hash for correctness.
+                if hashfunc(file_handle) != files[f][hash_key(hashname)]:
+                    rejmsg.append("%s: %s check failed in %s" % (f, hashname,
+                        where))
+            except CantOpenError:
+                # TODO: This happens when the file is in the pool.
+                warn("Cannot open file %s" % f)
                 continue
-
-            # Actually check the hash for correctness.
-            if hashfunc(file_handle) != files[f][hash_key(hashname)]:
-                rejmsg.append("%s: %s check failed in %s" % (f, hashname,
-                    where))
-        except CantOpenError:
-            # TODO: This happens when the file is in the pool.
-            warn("Cannot open file %s" % f)
-            continue
         finally:
             if file_handle:
                 file_handle.close()