From b0e4284130f645e80c1abbbe3de5a95bc647c3fe Mon Sep 17 00:00:00 2001 From: mdipierro Date: Fri, 14 Sep 2012 08:47:42 -0500 Subject: [PATCH] uninstalled apps backup under deposit --- VERSION | 2 +- applications/admin/controllers/default.py | 11 ++++++++--- gluon/admin.py | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index c3499d5b..548a2ee9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-13 21:48:36) stable +Version 2.0.9 (2012-09-14 08:47:38) stable diff --git a/applications/admin/controllers/default.py b/applications/admin/controllers/default.py index eb79ccea..0cb2e8de 100644 --- a/applications/admin/controllers/default.py +++ b/applications/admin/controllers/default.py @@ -366,10 +366,15 @@ def uninstall(): else: session.flash = T('no permission to uninstall "%s"', app) redirect(URL('site')) - if app_uninstall(app, request): - session.flash = T('application "%s" uninstalled', app) - else: + try: + filename = app_pack(app, request, raise_ex=True) + except: session.flash = T('unable to uninstall "%s"', app) + else: + if app_uninstall(app, request): + session.flash = T('application "%s" uninstalled', app) + else: + session.flash = T('unable to uninstall "%s"', app) redirect(URL('site')) return dict(app=app, dialog=dialog) diff --git a/gluon/admin.py b/gluon/admin.py index bb3bcf92..f6e70f01 100644 --- a/gluon/admin.py +++ b/gluon/admin.py @@ -60,7 +60,7 @@ def app_pack(app, request, raise_ex=False): """ try: app_cleanup(app, request) - filename = apath('../deposit/%s.w2p' % app, request) + filename = apath('../deposit/web2py.app.%s.w2p' % app, request) w2p_pack(filename, apath(app, request)) return filename except Exception, e: