← Back to branch summary

~divmod-dev/divmod.org/imap-server-440

« back to all changes in this revision

Viewing changes to Mantissa/xmantissa/website.py

  • Committer: moe
  • Date: 2006-01-30 17:05:26 UTC
  • Revision ID: svn-v4:866e43f7-fbfc-0310-8f2a-ec88d1da2979:trunk:4354
don't actually do anything in the website 2->3 upgrader if there isn't a static site to delete

Show diffs side-by-side

added added

removed removed

Lines of Context:
Mantissa/xmantissa/website.py
458
458
        securePortNumber=oldSite.securePortNumber,
459
459
        certificateFile=oldSite.certificateFile,
460
460
        httpLog=oldSite.httpLog)
461
 
    staticMistake = newSite.store.findUnique(StaticSite, StaticSite.prefixURL == u'static/mantissa')
462
 
    # Ugh, need cascading deletes
463
 
    staticMistake.store.powerDown(staticMistake, ISessionlessSiteRootPlugin)
464
 
    staticMistake.deleteFromStore()
 
461
    staticMistake = newSite.store.findUnique(StaticSite,
 
462
                                             StaticSite.prefixURL == u'static/mantissa',
 
463
                                             default=None)
 
464
    if staticMistake is not None:
 
465
        # Ugh, need cascading deletes
 
466
        staticMistake.store.powerDown(staticMistake, ISessionlessSiteRootPlugin)
 
467
        staticMistake.deleteFromStore()
465
468
    return newSite
466
469
upgrade.registerUpgrader(upgradeWebSite2to3, 'mantissa_web_powerup', 2, 3)