diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-07-15 08:14:44 (GMT) |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-07-15 08:14:44 (GMT) |
| commit | 087bc0e78bfc5ed6264e24241e1056caaaa2463c (patch) | |
| tree | f847e438ab5d79bbda789ee512ff4a49469586ef | |
| parent | fccfffa4cb05c30c4d390b413cbe44e246f44267 (diff) | |
Add patch 1003 to nest try-except in try-except-finally construct, for Python < 2.5 compatibility.
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/1003_avoid_try-except-finally.patch | 18 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 26 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 3d7d8a6..ca62e8f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +sugar-toolkit (0.81.6-2) unstable; urgency=low + + * Add patch 1003 to nest try-except in try-except-finally construct, + for Python < 2.5 compatibility. + + -- Jonas Smedegaard <dr@jones.dk> Tue, 15 Jul 2008 10:13:43 +0200 + sugar-toolkit (0.81.6-1) unstable; urgency=medium * New upstream release. diff --git a/debian/patches/1003_avoid_try-except-finally.patch b/debian/patches/1003_avoid_try-except-finally.patch new file mode 100644 index 0000000..a533f1c --- /dev/null +++ b/debian/patches/1003_avoid_try-except-finally.patch @@ -0,0 +1,18 @@ +diff --git a/src/sugar/bundle/bundle.py b/src/sugar/bundle/bundle.py +index 9e876c2..eb89a53 100644 +--- a/src/sugar/bundle/bundle.py ++++ b/src/sugar/bundle/bundle.py +@@ -125,9 +125,10 @@ class Bundle: + zip_file = zipfile.ZipFile(self._path) + path = os.path.join(self._zip_root_dir, filename) + try: +- zip_file.getinfo(path) +- except KeyError: +- return False ++ try: ++ zip_file.getinfo(path) ++ except KeyError: ++ return False + finally: + zip_file.close() + diff --git a/debian/patches/series b/debian/patches/series index 8d9cef5..23820bd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,7 @@ 0001_fix_unclean_buddy_crash.patch 1001_danish_l10n.patch 1002_fix_xsmp_implicit_pointer_conversion.patch +1003_avoid_try-except-finally.patch 2001_sha1_on_older_python.patch 2002_ignore_debian_and_quilt-patches.patch 2991_enable_danish_l10n.patch |