diff --git a/Makefile b/Makefile index ca1d0d22..6329b95a 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ update: wget -O gluon/contrib/simplejsonrpc.py http://rad2py.googlecode.com/hg/ide2py/simplejsonrpc.py echo "remember that pymysql was tweaked" src: - echo 'Version 2.0.5 ('`date +%Y-%m-%d\ %H:%M:%S`') stable' > VERSION + echo 'Version 2.0.6 ('`date +%Y-%m-%d\ %H:%M:%S`') stable' > VERSION ### rm -f all junk files make clean ### clean up baisc apps diff --git a/VERSION b/VERSION index b32f489f..3a4bab9d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.5 (2012-09-01 22:32:08) stable +Version 2.0.6 (2012-09-01 22:33:43) stable diff --git a/scripts/tickets2email.py b/scripts/tickets2email.py index ec4a7120..2a557282 100755 --- a/scripts/tickets2email.py +++ b/scripts/tickets2email.py @@ -26,10 +26,8 @@ administrator_email = 'you@localhost' while 1: for file in os.listdir(path): - filename = os.path.join(path, file) - if not ALLOW_DUPLICATES: - fileobj = open(filename, 'r') + fileobj = open(file, 'r') try: file_data = fileobj.read() finally: @@ -42,10 +40,10 @@ while 1: hashes[key] = 1 error = RestrictedError() - error.load(request, request.application, filename) + error.load(request, request.application, file) mail.send(to=administrator_email, subject='new web2py ticket', message=error.traceback) - os.unlink(filename) + os.unlink(os.path.join(path, file)) time.sleep(SLEEP_MINUTES * 60)