diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-10-19 09:49:53 (GMT) |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-10-19 09:49:53 (GMT) |
| commit | bb7bd96ce379692b5906beaf371475b5c2129d98 (patch) | |
| tree | 6f8f0428ed4edc723fdda65bedd4aab0cc47488a | |
| parent | 50178a68d2a352ea7a30231c4ec0c568ee4788fb (diff) | |
Drop patch 1003 no longer relevant (upstream routine rewritten).
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/1003_avoid_try-except-finally.patch | 18 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 1 insertions, 19 deletions
diff --git a/debian/changelog b/debian/changelog index d33984e..7629155 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ sugar-toolkit (0.82.11-1) UNRELEASED; urgency=low * New upstream release. * Drop patch 1002 now applied upstream. + * Drop patch 1003 no longer relevant (upstream routine rewritten). * Update debian/copyright and copyright hints (new copyright holders and years, same licenses). diff --git a/debian/patches/1003_avoid_try-except-finally.patch b/debian/patches/1003_avoid_try-except-finally.patch deleted file mode 100644 index a533f1c..0000000 --- a/debian/patches/1003_avoid_try-except-finally.patch +++ /dev/null @@ -1,18 +0,0 @@ -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 e25bb0c..71318d5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ 1001_danish_l10n.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 |