# HG changeset patch
# User Nicolas Chauvat <nicolas.chauvat@logilab.fr>
# Date 1571434743 -7200
# Node ID ff63319a1730d9970240d4684df91afc0dc56d06
# Parent  5c432a7fc442e170c9005666131b01a88a5c9334# Parent  9fa65579520f0c2dba413cfa791e0419fbd6105e
Merge 3.26

diff -r 5c432a7fc442 -r ff63319a1730 cubicweb/cwctl.py
--- a/cubicweb/cwctl.py	Thu May 23 00:33:04 2019 +0200
+++ b/cubicweb/cwctl.py	Fri Oct 18 23:39:03 2019 +0200
@@ -47,7 +47,7 @@
 from cubicweb.__pkginfo__ import version as cw_version
 
 LOG_LEVELS = ('debug', 'info', 'warning', 'error')
-DBG_FLAGS = ('RQL', 'SQL', 'REPO', 'HOOKS', 'OPS', 'SEC', 'MORE')
+DBG_FLAGS = ('RQL', 'SQL', 'REPO', 'HOOKS', 'OPS', 'SEC', 'MORE', 'ALL')
 
 # don't check duplicated commands, it occurs when reloading site_cubicweb
 CWCTL = CommandLine('cubicweb-ctl', 'The CubicWeb swiss-knife.',
diff -r 5c432a7fc442 -r ff63319a1730 cubicweb/server/repository.py
--- a/cubicweb/server/repository.py	Thu May 23 00:33:04 2019 +0200
+++ b/cubicweb/server/repository.py	Fri Oct 18 23:39:03 2019 +0200
@@ -557,8 +557,8 @@
                         fsversion = self.config.cubicweb_version()
                     if version < fsversion:
                         msg = ('instance has %s version %s but %s '
-                               'is installed. Run "cubicweb-ctl upgrade".')
-                        raise ExecutionError(msg % (cube, version, fsversion))
+                               'is installed. Run "cubicweb-ctl upgrade %s".')
+                        raise ExecutionError(msg % (cube, version, fsversion, self.config.appid))
         return vcconf
 
     @cached