diff --git a/VERSION b/VERSION index f5633051..7678f6f3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-07-05 22:24:31) dev +Version 2.00.0 (2012-07-05 22:28:51) dev diff --git a/applications/admin/controllers/openshift.py b/applications/admin/controllers/openshift.py index a04934d0..25a0a7e0 100644 --- a/applications/admin/controllers/openshift.py +++ b/applications/admin/controllers/openshift.py @@ -1,9 +1,13 @@ import os from distutils import dir_util -from git import * +try: + from git import * +except ImportError: + session.flash = 'requires python-git, but not installed' + redirect(URL('deafult','site')) def deploy(): - apps = sorted(file for file in os.listdir(apath(r=request)))#if regex.match(file)) + apps = sorted(file for file in os.listdir(apath(r=request))) form = SQLFORM.factory( Field('osrepo',default='/tmp',label='Path to local openshift repo root.', requires=EXISTS(error_message=T('directory not found'))), @@ -19,8 +23,7 @@ def deploy(): except: pass - ignore_apps = [item for item in apps \ - if not item in form.vars.applications] + ignore_apps = [item for item in apps if not item in form.vars.applications] regex = re.compile('\(applications/\(.*') w2p_origin = os.getcwd() osrepo = form.vars.osrepo @@ -36,7 +39,7 @@ def deploy(): dir_util.copy_tree(appsrc,appdest) #shutil.copytree(appsrc,appdest) index.add(['wsgi/'+osname+'/applications/'+i]) - new_commit = index.commit("Deploy from Web2py IDE") #<--- COMMIT WORKED.. Next.. on to actual push. + new_commit = index.commit("Deploy from Web2py IDE") origin = repo.remotes.origin origin.push