[Debian-l10n-commits] r2853 - in /pootle/trunk/debian/patches: sane_hooks.patch series

[themill-guest at users.alioth.debian.org]

Author: themill-guest
Date: Thu Feb  9 23:03:59 2012
New Revision: 2853

URL: http://svn.debian.org/wsvn/?sc=1&rev=2853
Log:
Include patch from trunk to ensure clean hook imports

Added:
    pootle/trunk/debian/patches/sane_hooks.patch
Modified:
    pootle/trunk/debian/patches/series

Added: pootle/trunk/debian/patches/sane_hooks.patch
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/patches/sane_hooks.patch?rev=2853&op=file
==============================================================================
--- pootle/trunk/debian/patches/sane_hooks.patch (added)
+++ pootle/trunk/debian/patches/sane_hooks.patch Thu Feb  9 23:03:59 2012
@@ -1,0 +1,16 @@
+Description: Ensure that projects with common names don't accidentally load hooks
+Author: Stuart Prescott <stuart+debian at nanonanonano.net>
+Applied-Upstream: r17978 /src/trunk/Pootle/pootle/scripts/hooks.py
+
+--- a/pootle/scripts/hooks.py
++++ b/pootle/scripts/hooks.py
+@@ -30,7 +30,8 @@
+             logger.debug("Executing hook %s for project %s on file %s", hooktype, project, file)
+             return getattr(activehook, hooktype)(file, *args, **kwargs)
+         else:
+-            return []
++            logger.debug("Imported %s, but it is not a suitable %s hook", activehook.__file__, hooktype)
++            raise ImportError("Imported %s, but it is not a suitable %s hook" % (activehook.__file__, hooktype))
+     except ImportError, e:
+         raise ImportError(e)
+     except Exception, e:

Modified: pootle/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/patches/series?rev=2853&op=diff
==============================================================================
--- pootle/trunk/debian/patches/series (original)
+++ pootle/trunk/debian/patches/series Thu Feb  9 23:03:59 2012
@@ -2,3 +2,4 @@
 debian_use_dbconfig.patch
 debian_extra_config.patch
 python26_deprecations.patch
+sane_hooks.patch