33365 2010-01-07 22:29:03 -0800 webkit-patch's use of auto-install is dropping autoinstall directories everywhere 2010-01-26 19:59:21 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric cjerdonek abarth cjerdonek tony oldest_to_newest 178531 0 eric 2010-01-07 22:29:03 -0800 webkit-patch's use of auto-install is dropping autoinstall directories everywhere We need to teach autoinstall to not use the CWD. Right now depending on where you run the command from, it will drop a new autoinstall direcotry there. That's bad. 184622 1 cjerdonek 2010-01-26 10:10:57 -0800 This has been annoying to me, too. I'll change it so that the autoinstall cache directory is put in the same directory as autoinstall. I also think the cache directory should give some indication of where it came from. The first time I saw them, I had no way to know what they were or where they were coming from. 184662 2 eric 2010-01-26 12:06:21 -0800 Mostly I've been afraid of python's "logging" module. I need to learn it. :( I suspect this fix is a one-lnine change to webkitpy/__init__.py (the one place we use autoinstall.py). 184723 3 47447 cjerdonek 2010-01-26 14:12:56 -0800 Created attachment 47447 Proposed patch The cache directory gets created when "import" is called for an external module (when searching for the module to import), rather than when autoinstall.py is first processed. Other possibilities would be to change the working directory prior to calling "import" for an external module, or to trigger the cache directory to get created while still inside __init__.py, but this seems most straightforward. 184734 4 47447 eric 2010-01-26 14:22:38 -0800 Comment on attachment 47447 Proposed patch LGTM. Thanks for taking care of this. Eventually we might upstream this change http://code.google.com/p/pyautoinstall/ 184895 5 47447 cjerdonek 2010-01-26 19:02:21 -0800 Comment on attachment 47447 Proposed patch cq- to use webkit-patch. 184897 6 47447 cjerdonek 2010-01-26 19:05:09 -0800 Comment on attachment 47447 Proposed patch Clearing flags on attachment: 47447 Committed r53887: <http://trac.webkit.org/changeset/53887> 184898 7 cjerdonek 2010-01-26 19:05:16 -0800 All reviewed patches have been landed. Closing bug. 184900 8 tony 2010-01-26 19:31:42 -0800 This seems to have broken webkit-patch for me. The error is: Failed to run "['WebKitTools/Scripts/test-webkitpy']" exit_code: 1 Last 500 characters of output: .py:201: Warning: 'with' will become a reserved keyword in Python 2.6 Traceback (most recent call last): File "WebKitTools/Scripts/test-webkitpy", line 33, in <module> from webkitpy.bugzilla_unittest import * File "/Users/tc/webkit/WebKit/WebKitTools/Scripts/webkitpy/__init__.py", line 3, in <module> import autoinstall File "/Users/tc/webkit/WebKit/WebKitTools/Scripts/webkitpy/autoinstall.py", line 201 with open(readme_path, "w") as f: ^ SyntaxError: invalid syntax Failed to run "['WebKitTools/Scripts/test-webkitpy']" exit_code: 1 184901 9 tony 2010-01-26 19:33:09 -0800 (In reply to comment #8) > This seems to have broken webkit-patch for me. The error is: This is from me running webkit-patch land-from-bug. It compiles fine, but seems to crash after it gets to "Running Python unit tests". From further up the stack: =========================================================== WebKit is now built (00m:27s). To run Safari with this newly-built code, use the "WebKitTools/Scripts/run-safari" script. =========================================================== Running Python unit tests /Users/tc/webkit/WebKit/WebKitTools/Scripts/webkitpy/autoinstall.py:201: Warning: 'with' will become a reserved keyword in Python 2.6 Traceback (most recent call last): File "WebKitTools/Scripts/test-webkitpy", line 33, in <module> from webkitpy.bugzilla_unittest import * File "/Users/tc/webkit/WebKit/WebKitTools/Scripts/webkitpy/__init__.py", line 3, in <module> import autoinstall File "/Users/tc/webkit/WebKit/WebKitTools/Scripts/webkitpy/autoinstall.py", line 201 with open(readme_path, "w") as f: ^ SyntaxError: invalid syntax 184903 10 cjerdonek 2010-01-26 19:41:12 -0800 (In reply to comment #9) ========== > Running Python unit tests > /Users/tc/webkit/WebKit/WebKitTools/Scripts/webkitpy/autoinstall.py:201: > Warning: 'with' will become a reserved keyword in Python 2.6 > Traceback (most recent call last): > File "WebKitTools/Scripts/test-webkitpy", line 33, in <module> > from webkitpy.bugzilla_unittest import * > File "/Users/tc/webkit/WebKit/WebKitTools/Scripts/webkitpy/__init__.py", line > 3, in <module> > import autoinstall > File "/Users/tc/webkit/WebKit/WebKitTools/Scripts/webkitpy/autoinstall.py", > line 201 > with open(readme_path, "w") as f: > ^ > SyntaxError: invalid syntax It looks like this requires an extra line of code for Python 2.5 users: http://docs.python.org/whatsnew/2.6.html#pep-343-the-with-statement from __future__ import with_statement What version of Python are you using? 184904 11 tony 2010-01-26 19:43:01 -0800 (In reply to comment #10) > It looks like this requires an extra line of code for Python 2.5 users: > > http://docs.python.org/whatsnew/2.6.html#pep-343-the-with-statement > > from __future__ import with_statement > > What version of Python are you using? pthon2.5.1, the default version on my mac (leopard). 184905 12 cjerdonek 2010-01-26 19:49:15 -0800 (In reply to comment #11) > (In reply to comment #10) > > It looks like this requires an extra line of code for Python 2.5 users: > > > > http://docs.python.org/whatsnew/2.6.html#pep-343-the-with-statement > > > > from __future__ import with_statement > > > > What version of Python are you using? > > pthon2.5.1, the default version on my mac (leopard). I can try fixing this by adding this line to the top of WebKitTools/Scripts/webkitpy/autoinstall.py: from __future__ import with_statement Tony, would you be able to try adding this on your machine to see if it resolves the issue? I don't have Python 2.5 installed. 184906 13 tony 2010-01-26 19:50:55 -0800 (In reply to comment #12) > I can try fixing this by adding this line to the top of > WebKitTools/Scripts/webkitpy/autoinstall.py: > > from __future__ import with_statement > > Tony, would you be able to try adding this on your machine to see if it > resolves the issue? I don't have Python 2.5 installed. That works for me (adding it above the __version__ line). Or you could rewrite the code to not use "with". :) It's not a lot of code either way. 184907 14 eric 2010-01-26 19:51:14 -0800 This broek the commit-queue too. r olling out. 184908 15 eric 2010-01-26 19:51:46 -0800 hmm... looks liek chris is on it... 184909 16 cjerdonek 2010-01-26 19:59:21 -0800 Attempted fix r53888: http://trac.webkit.org/changeset/53888 47447 2010-01-26 14:12:56 -0800 2010-01-26 19:05:09 -0800 Proposed patch _patch-33365-1.txt text/plain 2368 cjerdonek ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA0NDI3YTlkLi4xZDI4MmVkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMDEt MjYgIENocmlzIEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIFB5dGhvbiBhdXRvaW5zdGFs bCBjYWNoZSBkaXJlY3Rvcnkgbm93IG9ubHkgZ2V0cyBjcmVhdGVkCisgICAgICAgIGluIHRoZSBk aXJlY3RvcnkgY29udGFpbmluZyBhdXRvaW5zdGFsbC5weS4KKworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzMzNjUKKworICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvYXV0b2luc3RhbGwucHk6CisgICAgICAgICAgLSBBbHNvIGFkZGVkIGEgUkVBRE1F IGZpbGUgdG8gdGhlIGNhY2hlIGRpcmVjdG9yeSBzYXlpbmcKKyAgICAgICAgICAgIHdoZXJlIGl0 IGNhbWUgZnJvbS4KKwogMjAxMC0wMS0yNSAgQ2hyaXMgSmVyZG9uZWsgIDxjamVyZG9uZWtAd2Vi a2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaGluaWNoaXJvIEhhbWFqaS4KZGlmZiAt LWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvYXV0b2luc3RhbGwucHkgYi9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2F1dG9pbnN0YWxsLnB5CmluZGV4IDY0MWVmN2YuLjU1 YmZiZTUgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvYXV0b2luc3Rh bGwucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9hdXRvaW5zdGFsbC5weQpA QCAtMTc5LDE2ICsxNzksMjkgQEAgZGVmIGJpbmQocGFja2FnZV9uYW1lLCB1cmwsIHppcF9zdWJw YXRoPU5vbmUpOgogY2xhc3MgQ2FjaGUob2JqZWN0KToKIAogICAgIGRlZiBfX2luaXRfXyhzZWxm LCBkaXJlY3Rvcnk9Tm9uZSk6Ci0gICAgICAgIHNlbGYuZGlyZWN0b3J5ID0gZGlyZWN0b3J5IG9y ICIuL2F1dG9pbnN0YWxsLmNhY2hlLmQvIgorICAgICAgICBpZiBkaXJlY3RvcnkgaXMgTm9uZToK KyAgICAgICAgICAgICMgRGVmYXVsdCB0byBwdXR0aW5nIHRoZSBjYWNoZSBkaXJlY3RvcnkgaW4g dGhlIHNhbWUgZGlyZWN0b3J5CisgICAgICAgICAgICAjIGFzIHRoaXMgZmlsZS4KKyAgICAgICAg ICAgIGNvbnRhaW5pbmdfZGlyZWN0b3J5ID0gb3MucGF0aC5kaXJuYW1lKF9fZmlsZV9fKQorICAg ICAgICAgICAgZGlyZWN0b3J5ID0gb3MucGF0aC5qb2luKGNvbnRhaW5pbmdfZGlyZWN0b3J5LCAi YXV0b2luc3RhbGwuY2FjaGUuZCIpOworCisgICAgICAgIHNlbGYuZGlyZWN0b3J5ID0gZGlyZWN0 b3J5CiAgICAgICAgIHRyeToKICAgICAgICAgICAgIGlmIG5vdCBvcy5wYXRoLmV4aXN0cyhzZWxm LmRpcmVjdG9yeSk6Ci0gICAgICAgICAgICAgICAgX2xvZ2dlci5kZWJ1ZygiQ3JlYXRpbmcgY2Fj aGUgZGlyZWN0b3J5ICclcycuIiAlIHNlbGYuZGlyZWN0b3J5KQotICAgICAgICAgICAgICAgIG9z Lm1rZGlyKHNlbGYuZGlyZWN0b3J5KQorICAgICAgICAgICAgICAgIHNlbGYuX2NyZWF0ZV9jYWNo ZV9kaXJlY3RvcnkoKQogICAgICAgICBleGNlcHQgRXhjZXB0aW9uLCBlcnI6CiAgICAgICAgICAg ICBfbG9nZ2VyLmV4Y2VwdGlvbihlcnIpCiAgICAgICAgICAgICBzZWxmLmNhY2hlX2RpcmVjdHJ5 ID0gdGVtcGZpbGUubWtkdGVtcCgpCiAgICAgICAgIF9sb2dnZXIuaW5mbygiVXNpbmcgY2FjaGUg ZGlyZWN0b3J5ICclcycuIiAlIHNlbGYuZGlyZWN0b3J5KQogICAgIAorICAgIGRlZiBfY3JlYXRl X2NhY2hlX2RpcmVjdG9yeShzZWxmKToKKyAgICAgICAgX2xvZ2dlci5kZWJ1ZygiQ3JlYXRpbmcg Y2FjaGUgZGlyZWN0b3J5ICclcycuIiAlIHNlbGYuZGlyZWN0b3J5KQorICAgICAgICBvcy5ta2Rp cihzZWxmLmRpcmVjdG9yeSkKKyAgICAgICAgcmVhZG1lX3BhdGggPSBvcy5wYXRoLmpvaW4oc2Vs Zi5kaXJlY3RvcnksICJSRUFETUUiKQorICAgICAgICB3aXRoIG9wZW4ocmVhZG1lX3BhdGgsICJ3 IikgYXMgZjoKKyAgICAgICAgICAgIGYud3JpdGUoIlRoaXMgZGlyZWN0b3J5IHdhcyBhdXRvLWdl bmVyYXRlZCBieSAnJXMnLlxuIgorICAgICAgICAgICAgICAgICAgICAiSXQgaXMgc2FmZSB0byBk ZWxldGUuXG4iICUgX19maWxlX18pCisKICAgICBkZWYgZ2V0KHNlbGYsIHVybCk6CiAgICAgICAg IF9sb2dnZXIuaW5mbygiR2V0dGluZyAnJXMnIGZyb20gY2FjaGUuIiAlIHVybCkKICAgICAgICAg ZmlsZW5hbWUgPSB1cmwucnNwbGl0KCIvIilbLTFdCg==