[ckan-changes] [ckan/ckan] 948586: Does not load site_user during db upgrade

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: 948586d7fb2749ebb359d20c338a8b53cf705474
      https://github.com/ckan/ckan/commit/948586d7fb2749ebb359d20c338a8b53cf705474
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  Does not load site_user during db upgrade

Fixes #2029 by ensuring we do not attempt to load site_user during a db
upgrade.  This is a workaround because loading the site_user will fail
because of a failed user change.  Should also avoid the problem in
future.


  Commit: 479be73fe26e815b703a4461d371c833f5c60c44
      https://github.com/ckan/ckan/commit/479be73fe26e815b703a4461d371c833f5c60c44
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-21 (Fri, 21 Nov 2014)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  Merge branch '2029-no-site-user-during-migration'


Compare: https://github.com/ckan/ckan/compare/b45544157914...479be73fe26e