From f2247bc5b6aa030a95c06c181dc4dc6ce91321df Mon Sep 17 00:00:00 2001 From: mdipierro Date: Tue, 4 Sep 2012 14:47:13 -0500 Subject: [PATCH] prevent exception in admin, thanks Marin --- VERSION | 2 +- applications/admin/controllers/default.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index c1f458ec..994eff77 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.6 (2012-09-04 14:43:30) stable +Version 2.0.6 (2012-09-04 14:47:09) stable diff --git a/applications/admin/controllers/default.py b/applications/admin/controllers/default.py index 523af721..d3578578 100644 --- a/applications/admin/controllers/default.py +++ b/applications/admin/controllers/default.py @@ -244,11 +244,15 @@ def site(): DIV(T('Unable to download app because:'),PRE(str(e))) redirect(URL(r=request)) fname = form_update.vars.url - + elif form_update.accepted and form_update.vars.file: fname = request.vars.file.filename f = request.vars.file.file + else: + session.flash = 'No file uploaded and no URL specified' + redirect(URL(r=request)) + if f: appname = cleanpath(form_update.vars.name) installed = app_install(appname, f,