dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:web2py/web2py

Browse Source
This commit is contained in:
Michele Comitini
2012-05-16 22:40:38 +02:00
parent ec0c6d7059 8514d670a4
commit aeeab4e669
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.00.0 (2012-05-15 09:05:35) dev Version 2.00.0 (2012-05-16 11:15:52) dev
gluon/widget.py
+6 -5
View File
@@ -896,11 +896,12 @@ def start(cron=True):
if hasattr(options,key): if hasattr(options,key):
setattr(options,key,getattr(options2,key)) setattr(options,key,getattr(options2,key))
#if not os.path.exists('logging.conf'): if not os.path.exists('logging.conf') and \
# import shutil os.path.exists('logging.example.conf'):
# sys.stdout.write("Copying logging.conf.example to logging.conf ... ") import shutil
# shutil.copyfile('logging.example.conf', 'logging.conf') sys.stdout.write("Copying logging.conf.example to logging.conf ... ")
# sys.stdout.write("OK\n") shutil.copyfile('logging.example.conf', 'logging.conf')
sys.stdout.write("OK\n")
# ## if -T run doctests (no cron) # ## if -T run doctests (no cron)
if hasattr(options,'test') and options.test: if hasattr(options,'test') and options.test: