# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1278607724 -7200
# Node ID 4154bdc85fe4c057e7dab10b2981e23bb9c4b33a
# Parent  e13e7833a57a9434dcd4f912dca8114a1f978688# Parent  f7768f44b4ac159b0ec7c5aaf4c4791ba56121d4
backport stable

diff -r e13e7833a57a -r 4154bdc85fe4 devtools/testlib.py
--- a/devtools/testlib.py	Thu Jul 08 18:10:47 2010 +0200
+++ b/devtools/testlib.py	Thu Jul 08 18:48:44 2010 +0200
@@ -519,7 +519,7 @@
 
     def ctrl_publish(self, req, ctrl='edit'):
         """call the publish method of the edit controller"""
-        ctrl = self.vreg['controllers'].select(ctrl, req)
+        ctrl = self.vreg['controllers'].select(ctrl, req, appli=self.app)
         try:
             result = ctrl.publish()
             req.cnx.commit()
diff -r e13e7833a57a -r 4154bdc85fe4 skeleton/setup.py
--- a/skeleton/setup.py	Thu Jul 08 18:10:47 2010 +0200
+++ b/skeleton/setup.py	Thu Jul 08 18:48:44 2010 +0200
@@ -142,12 +142,9 @@
     # install-layout option was introduced in 2.5.3-1~exp1
     elif sys.version_info < (2, 5, 4) and '--install-layout=deb' in sys.argv:
         sys.argv.remove('--install-layout=deb')
-    kwargs['package_dir'] = {modname : '.'}
-    packages = [modname] + get_packages(os.getcwd(), modname)
     if USE_SETUPTOOLS and install_requires:
         kwargs['install_requires'] = install_requires
         kwargs['dependency_links'] = dependency_links
-    kwargs['packages'] = packages
     return setup(name = distname,
                  version = version,
                  license = license,