diff --git a/VERSION b/VERSION index 9a63ee53..c1ee9c65 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.6.0-development+timestamp.2013.08.26.06.04.21 +Version 2.6.0-development+timestamp.2013.08.26.16.56.15 diff --git a/gluon/widget.py b/gluon/widget.py index ed966dc1..e719b073 100644 --- a/gluon/widget.py +++ b/gluon/widget.py @@ -1100,11 +1100,11 @@ def start(cron=True): if hasattr(options, key): setattr(options, key, getattr(options2, key)) - if False and not os.path.exists('logging.conf') and \ - os.path.exists('logging.example.conf'): + logfile0 = os.path.join('extras','examples','logging.example.conf') + if not os.path.exists('logging.conf') and os.path.exists(logfile0): import shutil sys.stdout.write("Copying logging.conf.example to logging.conf ... ") - shutil.copyfile('logging.example.conf', 'logging.conf') + shutil.copyfile('logging.example.conf', logfile0) sys.stdout.write("OK\n") # ## if -T run doctests (no cron)