tags 582117 + pending tags 582800 + pending thanks Dear maintainer,
I've prepared an NMU for albatross (versioned as 1.36-5.4) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127 diff -u albatross-1.36/debian/rules albatross-1.36/debian/rules --- albatross-1.36/debian/rules +++ albatross-1.36/debian/rules @@ -26,10 +26,11 @@ dh_testdir # run the session server PYTHONPATH=`pwd` session-server/al-session-daemon -k $$MY_DIR/sess.pid -l $$MY_DIR/log start - # run the tests - make -C test all - # stop the session server - PYTHONPATH=`pwd` session-server/al-session-daemon -k $$MY_DIR/sess.pid -l $$MY_DIR/log stop + # run the tests, stop the session server + make -C test all; \ + result=$$?; \ + PYTHONPATH=`pwd` session-server/al-session-daemon -k $$MY_DIR/sess.pid -l $$MY_DIR/log stop; \ + exit $$result touch $@ # Targets for building different parts of the package diff -u albatross-1.36/debian/changelog albatross-1.36/debian/changelog --- albatross-1.36/debian/changelog +++ albatross-1.36/debian/changelog @@ -1,3 +1,13 @@ +albatross (1.36-5.4) unstable; urgency=low + + * Non-maintainer upload. + * Python 2.6 support patch: __import__ now takes an optional level argument; + account for this in SessionBase.decode_session. (Closes: #582117). Thanks + to Colin Watson from Ubuntu for the patch. + * Shut down test server if tests fail (Closes: #582800) + + -- Stefano Rivera <stef...@rivera.za.net> Sun, 23 May 2010 21:04:29 +0200 + albatross (1.36-5.3) unstable; urgency=low * Non-maintainer upload. only in patch2: unchanged: --- albatross-1.36.orig/albatross/context.py +++ albatross-1.36/albatross/context.py @@ -644,11 +644,11 @@ self.clear_locals() def decode_session(self, text): - def imp_hook(name, globals=None, locals=None, fromlist=None): + def imp_hook(name, globals=None, locals=None, fromlist=None, level=-1): if self.app.is_page_module(name): return self.app.load_page_module(self, name) else: - return real_imp(name, globals, locals, fromlist) + return real_imp(name, globals, locals, fromlist, level) real_imp, __builtin__.__import__ = __builtin__.__import__, imp_hook try:
signature.asc
Description: Digital signature
