Package: gdesklets Version: 0.36.1-4 Severity: normal Tags: patch
The bug #561645 was closed with a incorrect patch. The patch in debian/patches dir create a new file in debian/patches and don't edit utils/ErrorFormatter.py file. It seems to be a debdiff patch, not a debian/patch file. $ fakeroot debian/rules apply-patches $ ls debian/patches/ 01_python2.6.patch 01_python2.6.patch.level-1.log 10_python2.6.patch $ cat debian/patches/10_python2.6.patch Description: Fix exception when running under python2.6. Patch from Ubuntu, commited upstream. Origin: https://bugs.launchpad.net/gdesklets/+bug/344079 Forwarded: http://bazaar.launchpad.net/~gdesklets-core-team/gdesklets/0.3x/revision/118 diff -Nur -x '*.orig' -x '*~' gdesklets-0.36.1-2ubuntu1/utils/ErrorFormatter.py gdesklets-0.36.1-2ubuntu1.new/utils/ErrorFormatter.py --- gdesklets-0.36.1-2ubuntu1/utils/ErrorFormatter.py 2009-03-25 11:53:35.000000000 -0400 +++ gdesklets-0.36.1-2ubuntu1.new/utils/ErrorFormatter.py 2009-05-12 13:38:39.000000000 -0400 @@ -113,9 +113,9 @@ # give us an absolute path. # _old_imp = __import__ -def _new_imp(name, globs = {}, locls = {}, fromlist = []): +def _new_imp(*args, **kwargs): - module = _old_imp(name, globs, locls, fromlist) + module = _old_imp(*args, **kwargs) # builtin modules have no "__file__" attribute, so we have to check for it if (module): if (hasattr(module, "__file__")): $ grep _old_imp utils/ErrorFormatter.py _old_imp = __import__ module = _old_imp(name, globs, locls, fromlist) Please re-add the correct patch Greetings -- System Information: Debian Release: squeeze/sid APT prefers unstable APT policy: (500, 'unstable') Architecture: i386 (i686) Kernel: Linux 2.6.32-5-686 (SMP w/2 CPU cores) Locale: LANG=es_ES.utf8, LC_CTYPE=es_ES.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash
Description: Fix exception when running under python2.6. Patch from Ubuntu, commited upstream. Origin: https://bugs.launchpad.net/gdesklets/+bug/344079 Forwarded: http://bazaar.launchpad.net/~gdesklets-core-team/gdesklets/0.3x/revision/118 diff -Nur -x '*.orig' -x '*~' gdesklets-0.36.1-2ubuntu1/utils/ErrorFormatter.py gdesklets-0.36.1-2ubuntu1.new/utils/ErrorFormatter.py --- gdesklets-0.36.1-2ubuntu1/utils/ErrorFormatter.py 2009-03-25 11:53:35.000000000 -0400 +++ gdesklets-0.36.1-2ubuntu1.new/utils/ErrorFormatter.py 2009-05-12 13:38:39.000000000 -0400 @@ -113,9 +113,9 @@ # give us an absolute path. # _old_imp = __import__ -def _new_imp(name, globs = {}, locls = {}, fromlist = []): +def _new_imp(*args, **kwargs): - module = _old_imp(name, globs, locls, fromlist) + module = _old_imp(*args, **kwargs) # builtin modules have no "__file__" attribute, so we have to check for it if (module): if (hasattr(module, "__file__")):
