98785 2012-10-09 09:12:33 -0700 [GTK] Shadow builds are not working anymore. 2012-10-09 11:37:27 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 menard menard mrobinson pnormand webkit.review.bot xan.lopez oldest_to_newest 737843 0 menard 2012-10-09 09:12:33 -0700 [GTK] Shadow builds are not working anymore. 737849 1 167769 menard 2012-10-09 09:15:28 -0700 Created attachment 167769 Patch 737850 2 menard 2012-10-09 09:17:30 -0700 The build miserably fail with a python error and even if I fix it, despite I built with jhbuild it tries to config check against system libraries. 737851 3 167770 menard 2012-10-09 09:18:16 -0700 Created attachment 167770 Patch 737856 4 menard 2012-10-09 09:23:10 -0700 (In reply to comment #3) > Created an attachment (id=167770) [details] > Patch Also one nice thing to do to avoid the shadow build to break regularly is to setup one of the 4 GTK bots as a shadow build :). I think we have one Qt bot setup with shadow build. It may be not a very useful feature when you only hack GTK but it is very useful for people working cross port features where you don't want the source dir to be modified. Anyway feedback on the patch. I'm not very sure of myself, my knowledge of the GTK buildsystem is very limited :) 737859 5 167771 menard 2012-10-09 09:24:37 -0700 Created attachment 167771 Patch 737867 6 167770 mrobinson 2012-10-09 09:31:06 -0700 Comment on attachment 167770 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=167770&action=review > Tools/gtk/run-with-jhbuild:26 > +wrapper = common.top_level_path('Tools', 'jhbuild', 'jhbuild-wrapper') > +os.execve(wrapper, [wrapper, '--gtk', 'run'] + sys.argv[1:], os.environ) It seems like this will break things for people who don't use the WebKit jhbuild at all. 737881 7 menard 2012-10-09 09:47:54 -0700 (In reply to comment #6) > (From update of attachment 167770 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=167770&action=review > > > Tools/gtk/run-with-jhbuild:26 > > +wrapper = common.top_level_path('Tools', 'jhbuild', 'jhbuild-wrapper') > > +os.execve(wrapper, [wrapper, '--gtk', 'run'] + sys.argv[1:], os.environ) > > It seems like this will break things for people who don't use the WebKit jhbuild at all. Obvious but is it the recommended way to not use jhbuild. From the wiki it seems you have to use it. Other thing is that the trunk depends on really really recent version of libraries that for example Archlinux doesn't even provide (and Arch is know to be pretty up to date) so I wonder if the build without jhbuild is actually possible without complicated PKG_CONFIG trickery. Other thing I could do is modify the condition "os.path.exists(common.top_level_path('WebKitBuild', 'Dependencies')):" to also read WEBKITOUTPUTDIR. 737886 8 mrobinson 2012-10-09 09:52:44 -0700 (In reply to comment #7) > Obvious but is it the recommended way to not use jhbuild. From the wiki it seems you have to use it. Other thing is that the trunk depends on really really recent version of libraries that for example Archlinux doesn't even provide (and Arch is know to be pretty up to date) so I wonder if the build without jhbuild is actually possible without complicated PKG_CONFIG trickery. There are several very active WebKitGTK+ developers that do not use the internal jhbuild. This isn't likely to change any time soon. > Other thing I could do is modify the condition "os.path.exists(common.top_level_path('WebKitBuild', 'Dependencies')):" to also read WEBKITOUTPUTDIR. It looks like what we want here is to use get_dependencies_path from Tools/jhbuild/jhbuildutils.py. 737937 9 167783 menard 2012-10-09 10:51:43 -0700 Created attachment 167783 Patch 737941 10 167783 mrobinson 2012-10-09 10:55:01 -0700 Comment on attachment 167783 Patch Thanks! 737945 11 167783 webkit.review.bot 2012-10-09 10:58:45 -0700 Comment on attachment 167783 Patch Rejecting attachment 167783 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: '--force', u'--reviewer', u'Martin Rob..." exit_code: 1 cwd: /mnt/git/webkit-commit-queue Parsed 2 diffs from patch file(s). patching file Tools/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Tools/gtk/run-with-jhbuild Hunk #1 FAILED at 22. 1 out of 1 hunk FAILED -- saving rejects to file Tools/gtk/run-with-jhbuild.rej Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force', u'--reviewer', u'Martin Rob..." exit_code: 1 cwd: /mnt/git/webkit-commit-queue Full output: http://queues.webkit.org/results/14228700 737958 12 167791 menard 2012-10-09 11:13:00 -0700 Created attachment 167791 Patch for landing 737995 13 167791 webkit.review.bot 2012-10-09 11:37:24 -0700 Comment on attachment 167791 Patch for landing Clearing flags on attachment: 167791 Committed r130781: <http://trac.webkit.org/changeset/130781> 737996 14 webkit.review.bot 2012-10-09 11:37:27 -0700 All reviewed patches have been landed. Closing bug. 167769 2012-10-09 09:15:28 -0700 2012-10-09 09:18:08 -0700 Patch bug-98785-20121009131432.patch text/plain 1712 menard U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwNjgzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDM5ZjAwMjY2ZWUyYTA1MzE3OTJhZDliN2UwNjE2Zjkx NjcwMmY0ZC4uNjEwOWE0NzQzOWE1MWJlMTRiYjIwODRiYjA0OGEwYTQzNzY4ZjNkYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDEyLTEwLTA5ICBBbGV4aXMgTWVuYXJkICA8YWxleGlzLm1lbmFyZEBvcGVuYm9zc2Eu b3JnPgorCisgICAgICAgIFtHVEtdIFNoYWRvdyBidWlsZHMgYXJlIG5vdCB3b3JraW5nIGFueW1v cmUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05ODc4 NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpcnN0 LCB0aGUgb3MuZXhlY3ZlIGNhbGwgd2FzIG5vdCBldmVuIHdvcmtpbmcgYXMgdGhlIGZ1bmN0aW9u IHRha2VzCisgICAgICAgIHRocmVlIGFyZ3VtZW50cy4gU2Vjb25kbHkgZXZlbiB3aXRoIGEgc2hh ZG93IGJ1aWxkIHdoZXJlIFdFQktJVE9VVFBVVERJUgorICAgICAgICBpcyBzZXQgaXQgc2VlbXMg dGhhdCB5b3UgYW55d2F5IGJ1aWxkIHdpdGggamhidWlsZCB0aGVyZWZvcmUgeW91IG5lZWQgdG8K KyAgICAgICAgaW52b2tlIGl0IG90aGVyd2lzZSBkZXBlbmRlbmNpZXMgY2hlY2tzIGFyZSBtYWRl IGFnYWluc3QgdGhlIHN5c3RlbSBsaWJyYWlyaWVzCisgICAgICAgIHJhdGhlciB0aGUgb25lcyB3 ZSBqdXN0IGJ1aWx0IHdpdGggamhidWlsZC4KKworICAgICAgICAqIGd0ay9ydW4td2l0aC1qaGJ1 aWxkOgorCiAyMDEyLTEwLTA4ICBaYW4gRG9iZXJzZWsgIDx6YW5kb2JlcnNla0BnbWFpbC5jb20+ CiAKICAgICAgICAgR1RLIHBvcnQgc2hvdWxkIHdhcm4gaWYgYnVnIG1vZGlmaWVyIGlzIG1pc3Np bmcgaW4gVGVzdEV4cGVjdGF0aW9ucwpkaWZmIC0tZ2l0IGEvVG9vbHMvZ3RrL3J1bi13aXRoLWpo YnVpbGQgYi9Ub29scy9ndGsvcnVuLXdpdGgtamhidWlsZAppbmRleCA0ZTE1ZWM0NDU4OTFlNGU1 MzhjN2Q0Mzc5NDg3MTBhZWRmZmRmODJmLi4wYzBiYTUxM2I2YzQ0YTZlYTFiODJhZThiMjc2YzU3 N2RjZDlkZjllIDEwMDc1NQotLS0gYS9Ub29scy9ndGsvcnVuLXdpdGgtamhidWlsZAorKysgYi9U b29scy9ndGsvcnVuLXdpdGgtamhidWlsZApAQCAtMjIsOSArMjIsNiBAQCBpbXBvcnQgb3MKIGlt cG9ydCBzdWJwcm9jZXNzCiBpbXBvcnQgc3lzCiAKLWlmIG5vdCBvcy5wYXRoLmV4aXN0cyhjb21t b24udG9wX2xldmVsX3BhdGgoJ1dlYktpdEJ1aWxkJywgJ0RlcGVuZGVuY2llcycpKToKLSAgICBv cy5leGVjdmUoc3lzLmFyZ3ZbMV0sIHN5cy5hcmd2WzFdKQotZWxzZToKLSAgICB3cmFwcGVyID0g Y29tbW9uLnRvcF9sZXZlbF9wYXRoKCdUb29scycsICdqaGJ1aWxkJywgJ2poYnVpbGQtd3JhcHBl cicpCi0gICAgb3MuZXhlY3ZlKHdyYXBwZXIsIFt3cmFwcGVyLCAnLS1ndGsnLCAncnVuJ10gKyBz eXMuYXJndlsxOl0sIG9zLmVudmlyb24pCit3cmFwcGVyID0gY29tbW9uLnRvcF9sZXZlbF9wYXRo KCdUb29scycsICdqaGJ1aWxkJywgJ2poYnVpbGQtd3JhcHBlcicpCitvcy5leGVjdmUod3JhcHBl ciwgW3dyYXBwZXIsICctLWd0aycsICdydW4nXSArIHN5cy5hcmd2WzE6XSwgb3MuZW52aXJvbikK IAo= 167770 2012-10-09 09:18:16 -0700 2012-10-09 09:31:06 -0700 Patch bug-98785-20121009131720.patch text/plain 1711 menard U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwNjgzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDM5ZjAwMjY2ZWUyYTA1MzE3OTJhZDliN2UwNjE2Zjkx NjcwMmY0ZC4uZTQ0NTg4NTAzNDczMjQzZDA3NTA3MmJiNzQwYjU5MjU4YTBkMzZlOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDEyLTEwLTA5ICBBbGV4aXMgTWVuYXJkICA8YWxleGlzLm1lbmFyZEBvcGVuYm9zc2Eu b3JnPgorCisgICAgICAgIFtHVEtdIFNoYWRvdyBidWlsZHMgYXJlIG5vdCB3b3JraW5nIGFueW1v cmUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05ODc4 NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpcnN0 LCB0aGUgb3MuZXhlY3ZlIGNhbGwgd2FzIG5vdCBldmVuIHdvcmtpbmcgYXMgdGhlIGZ1bmN0aW9u IHRha2VzCisgICAgICAgIHRocmVlIGFyZ3VtZW50cy4gU2Vjb25kbHkgZXZlbiB3aXRoIGEgc2hh ZG93IGJ1aWxkIHdoZXJlIFdFQktJVE9VVFBVVERJUgorICAgICAgICBpcyBzZXQgaXQgc2VlbXMg dGhhdCB5b3UgYW55d2F5IGJ1aWxkIHdpdGggamhidWlsZCB0aGVyZWZvcmUgeW91IG5lZWQgdG8K KyAgICAgICAgaW52b2tlIGl0IG90aGVyd2lzZSBkZXBlbmRlbmNpZXMgY2hlY2tzIGFyZSBtYWRl IGFnYWluc3QgdGhlIHN5c3RlbSBsaWJyYXJpZXMKKyAgICAgICAgcmF0aGVyIHRoZSBvbmVzIHdl IGp1c3QgYnVpbHQgd2l0aCBqaGJ1aWxkLgorCisgICAgICAgICogZ3RrL3J1bi13aXRoLWpoYnVp bGQ6CisKIDIwMTItMTAtMDggIFphbiBEb2JlcnNlayAgPHphbmRvYmVyc2VrQGdtYWlsLmNvbT4K IAogICAgICAgICBHVEsgcG9ydCBzaG91bGQgd2FybiBpZiBidWcgbW9kaWZpZXIgaXMgbWlzc2lu ZyBpbiBUZXN0RXhwZWN0YXRpb25zCmRpZmYgLS1naXQgYS9Ub29scy9ndGsvcnVuLXdpdGgtamhi dWlsZCBiL1Rvb2xzL2d0ay9ydW4td2l0aC1qaGJ1aWxkCmluZGV4IDRlMTVlYzQ0NTg5MWU0ZTUz OGM3ZDQzNzk0ODcxMGFlZGZmZGY4MmYuLjBjMGJhNTEzYjZjNDRhNmVhMWI4MmFlOGIyNzZjNTc3 ZGNkOWRmOWUgMTAwNzU1Ci0tLSBhL1Rvb2xzL2d0ay9ydW4td2l0aC1qaGJ1aWxkCisrKyBiL1Rv b2xzL2d0ay9ydW4td2l0aC1qaGJ1aWxkCkBAIC0yMiw5ICsyMiw2IEBAIGltcG9ydCBvcwogaW1w b3J0IHN1YnByb2Nlc3MKIGltcG9ydCBzeXMKIAotaWYgbm90IG9zLnBhdGguZXhpc3RzKGNvbW1v bi50b3BfbGV2ZWxfcGF0aCgnV2ViS2l0QnVpbGQnLCAnRGVwZW5kZW5jaWVzJykpOgotICAgIG9z LmV4ZWN2ZShzeXMuYXJndlsxXSwgc3lzLmFyZ3ZbMV0pCi1lbHNlOgotICAgIHdyYXBwZXIgPSBj b21tb24udG9wX2xldmVsX3BhdGgoJ1Rvb2xzJywgJ2poYnVpbGQnLCAnamhidWlsZC13cmFwcGVy JykKLSAgICBvcy5leGVjdmUod3JhcHBlciwgW3dyYXBwZXIsICctLWd0aycsICdydW4nXSArIHN5 cy5hcmd2WzE6XSwgb3MuZW52aXJvbikKK3dyYXBwZXIgPSBjb21tb24udG9wX2xldmVsX3BhdGgo J1Rvb2xzJywgJ2poYnVpbGQnLCAnamhidWlsZC13cmFwcGVyJykKK29zLmV4ZWN2ZSh3cmFwcGVy LCBbd3JhcHBlciwgJy0tZ3RrJywgJ3J1biddICsgc3lzLmFyZ3ZbMTpdLCBvcy5lbnZpcm9uKQog Cg== 167771 2012-10-09 09:24:37 -0700 2012-10-09 10:51:40 -0700 Patch bug-98785-20121009132341.patch text/plain 1711 menard U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwNjgzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDM5ZjAwMjY2ZWUyYTA1MzE3OTJhZDliN2UwNjE2Zjkx NjcwMmY0ZC4uZTQ0NTg4NTAzNDczMjQzZDA3NTA3MmJiNzQwYjU5MjU4YTBkMzZlOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDEyLTEwLTA5ICBBbGV4aXMgTWVuYXJkICA8YWxleGlzLm1lbmFyZEBvcGVuYm9zc2Eu b3JnPgorCisgICAgICAgIFtHVEtdIFNoYWRvdyBidWlsZHMgYXJlIG5vdCB3b3JraW5nIGFueW1v cmUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05ODc4 NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpcnN0 LCB0aGUgb3MuZXhlY3ZlIGNhbGwgd2FzIG5vdCBldmVuIHdvcmtpbmcgYXMgdGhlIGZ1bmN0aW9u IHRha2VzCisgICAgICAgIHRocmVlIGFyZ3VtZW50cy4gU2Vjb25kbHkgZXZlbiB3aXRoIGEgc2hh ZG93IGJ1aWxkIHdoZXJlIFdFQktJVE9VVFBVVERJUgorICAgICAgICBpcyBzZXQgaXQgc2VlbXMg dGhhdCB5b3UgYW55d2F5IGJ1aWxkIHdpdGggamhidWlsZCB0aGVyZWZvcmUgeW91IG5lZWQgdG8K KyAgICAgICAgaW52b2tlIGl0IG90aGVyd2lzZSBkZXBlbmRlbmNpZXMgY2hlY2tzIGFyZSBtYWRl IGFnYWluc3QgdGhlIHN5c3RlbSBsaWJyYXJpZXMKKyAgICAgICAgcmF0aGVyIHRoZSBvbmVzIHdl IGp1c3QgYnVpbHQgd2l0aCBqaGJ1aWxkLgorCisgICAgICAgICogZ3RrL3J1bi13aXRoLWpoYnVp bGQ6CisKIDIwMTItMTAtMDggIFphbiBEb2JlcnNlayAgPHphbmRvYmVyc2VrQGdtYWlsLmNvbT4K IAogICAgICAgICBHVEsgcG9ydCBzaG91bGQgd2FybiBpZiBidWcgbW9kaWZpZXIgaXMgbWlzc2lu ZyBpbiBUZXN0RXhwZWN0YXRpb25zCmRpZmYgLS1naXQgYS9Ub29scy9ndGsvcnVuLXdpdGgtamhi dWlsZCBiL1Rvb2xzL2d0ay9ydW4td2l0aC1qaGJ1aWxkCmluZGV4IDRlMTVlYzQ0NTg5MWU0ZTUz OGM3ZDQzNzk0ODcxMGFlZGZmZGY4MmYuLjBjMGJhNTEzYjZjNDRhNmVhMWI4MmFlOGIyNzZjNTc3 ZGNkOWRmOWUgMTAwNzU1Ci0tLSBhL1Rvb2xzL2d0ay9ydW4td2l0aC1qaGJ1aWxkCisrKyBiL1Rv b2xzL2d0ay9ydW4td2l0aC1qaGJ1aWxkCkBAIC0yMiw5ICsyMiw2IEBAIGltcG9ydCBvcwogaW1w b3J0IHN1YnByb2Nlc3MKIGltcG9ydCBzeXMKIAotaWYgbm90IG9zLnBhdGguZXhpc3RzKGNvbW1v bi50b3BfbGV2ZWxfcGF0aCgnV2ViS2l0QnVpbGQnLCAnRGVwZW5kZW5jaWVzJykpOgotICAgIG9z LmV4ZWN2ZShzeXMuYXJndlsxXSwgc3lzLmFyZ3ZbMV0pCi1lbHNlOgotICAgIHdyYXBwZXIgPSBj b21tb24udG9wX2xldmVsX3BhdGgoJ1Rvb2xzJywgJ2poYnVpbGQnLCAnamhidWlsZC13cmFwcGVy JykKLSAgICBvcy5leGVjdmUod3JhcHBlciwgW3dyYXBwZXIsICctLWd0aycsICdydW4nXSArIHN5 cy5hcmd2WzE6XSwgb3MuZW52aXJvbikKK3dyYXBwZXIgPSBjb21tb24udG9wX2xldmVsX3BhdGgo J1Rvb2xzJywgJ2poYnVpbGQnLCAnamhidWlsZC13cmFwcGVyJykKK29zLmV4ZWN2ZSh3cmFwcGVy LCBbd3JhcHBlciwgJy0tZ3RrJywgJ3J1biddICsgc3lzLmFyZ3ZbMTpdLCBvcy5lbnZpcm9uKQog Cg== 167783 2012-10-09 10:51:43 -0700 2012-10-09 11:12:56 -0700 Patch bug-98785-20121009145047.patch text/plain 2006 menard U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwNjgzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDM5ZjAwMjY2ZWUyYTA1MzE3OTJhZDliN2UwNjE2Zjkx NjcwMmY0ZC4uYjg2ZTA5MjU2NGQ5MzNjMzM3ZDI0M2Q1YTA3MTU0YTVjYmI2NDUyNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDEyLTEwLTA5ICBBbGV4aXMgTWVuYXJkICA8YWxleGlzQHdlYmtpdC5vcmc+CisKKyAg ICAgICAgW0dUS10gU2hhZG93IGJ1aWxkcyBhcmUgbm90IHdvcmtpbmcgYW55bW9yZS4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk4Nzg1CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBzZXR0aW5nIFdF QktJVE9VVFBVVERJUiB0aGUgYnVpbGQgd2FzIGZhaWxpbmcgd2l0aCBhIHB5dGhvbgorICAgICAg ICBlcnJvciA6IHRoZSBvcy5leGVjdmUgZXhwZWN0IHRocmVlIGFyZ3VtZW50cy4gQWxzbyB0aGUg Y29uZGl0aW9uCisgICAgICAgIHRvIGNoZWNrIHdoZXRoZXIgd2UgYnVpbGQgdGhlIEdUSyBwb3J0 IHdpdGggamhidWlsZCBvciBub3Qgd2FzIGJ1Z2d5CisgICAgICAgIGFzIGl0IHdhcyBhbHdheXMg YXNzdW1pbmcgYW4gaW4gc291cmNlIGJ1aWxkLiBXZSBjYW4gdXNlIG5vdyBqaGJ1aWxkdXRpbHMK KyAgICAgICAgd2hpY2ggaGFzIGEgY29udmVuaWVudCBmdW5jdGlvbiB0byBsb2NhdGUgdGhlIGRp cmVjdG9yeSB3aGVyZSAKKyAgICAgICAgdGhlIGRlcGVuZGVuY2llcyBidWlsdCB3aXRoIGpoYnVp bGQgYXJlIGFuZCB0YWtlIGludG8gYWNjb3VudCBXRUJLSVRPVVRQVVRESVIuCisgICAgICAgIElm IHRoZSBEZXBlbmRlbmNpZXMgcGF0aCBkb2VzIG5vdCBleGlzdCB0aGVuIHRoZSBidWlsZCB3YXMg bm90IGRvbmUgdXNpbmcKKyAgICAgICAgamhidWlsZCBzbyB3ZSBjYW4gZmFsbGJhY2sgdG8gYSBy ZWd1bGFyIGJ1aWxkIGFnYWluc3Qgc3lzdGVtIGxpYnJhcmllcy4KKworICAgICAgICAqIGd0ay9y dW4td2l0aC1qaGJ1aWxkOgorCiAyMDEyLTEwLTA4ICBaYW4gRG9iZXJzZWsgIDx6YW5kb2JlcnNl a0BnbWFpbC5jb20+CiAKICAgICAgICAgR1RLIHBvcnQgc2hvdWxkIHdhcm4gaWYgYnVnIG1vZGlm aWVyIGlzIG1pc3NpbmcgaW4gVGVzdEV4cGVjdGF0aW9ucwpkaWZmIC0tZ2l0IGEvVG9vbHMvZ3Rr L3J1bi13aXRoLWpoYnVpbGQgYi9Ub29scy9ndGsvcnVuLXdpdGgtamhidWlsZAppbmRleCA0ZTE1 ZWM0NDU4OTFlNGU1MzhjN2Q0Mzc5NDg3MTBhZWRmZmRmODJmLi5hOWFmZmZmYjk4Y2I1OTYxMGEy MTYyMGQ5NjUwNGQ5M2RjMzkxOWQ2IDEwMDc1NQotLS0gYS9Ub29scy9ndGsvcnVuLXdpdGgtamhi dWlsZAorKysgYi9Ub29scy9ndGsvcnVuLXdpdGgtamhidWlsZApAQCAtMjIsOCArMjIsMTEgQEAg aW1wb3J0IG9zCiBpbXBvcnQgc3VicHJvY2VzcwogaW1wb3J0IHN5cwogCi1pZiBub3Qgb3MucGF0 aC5leGlzdHMoY29tbW9uLnRvcF9sZXZlbF9wYXRoKCdXZWJLaXRCdWlsZCcsICdEZXBlbmRlbmNp ZXMnKSk6Ci0gICAgb3MuZXhlY3ZlKHN5cy5hcmd2WzFdLCBzeXMuYXJndlsxXSkKK3N5cy5wYXRo LmFwcGVuZChjb21tb24udG9wX2xldmVsX3BhdGgoJ1Rvb2xzJywgJ2poYnVpbGQnKSkKK2ltcG9y dCBqaGJ1aWxkdXRpbHMKKworaWYgKG5vdCBvcy5wYXRoLmV4aXN0cyhqaGJ1aWxkdXRpbHMuZ2V0 X2RlcGVuZGVuY2llc19wYXRoKCkpKToKKyAgICBvcy5leGVjdmUoc3lzLmFyZ3ZbMV0sIHN5cy5h cmd2WzE6XSwgb3MuZW52aXJvbikKIGVsc2U6CiAgICAgd3JhcHBlciA9IGNvbW1vbi50b3BfbGV2 ZWxfcGF0aCgnVG9vbHMnLCAnamhidWlsZCcsICdqaGJ1aWxkLXdyYXBwZXInKQogICAgIG9zLmV4 ZWN2ZSh3cmFwcGVyLCBbd3JhcHBlciwgJy0tZ3RrJywgJ3J1biddICsgc3lzLmFyZ3ZbMTpdLCBv cy5lbnZpcm9uKQo= 167791 2012-10-09 11:13:00 -0700 2012-10-09 11:37:24 -0700 Patch for landing bug-98785-20121009151204.patch text/plain 2068 menard U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwNzc4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGFjZDE5MzU1NzU2MDQ1MzUzM2IzZjhjN2U3Y2M4MTZk MzVkNTZiZS4uMWUyZTAxY2NkNDVlZjExYWJkYjBjOGMxM2EzZmQwMGExNjNiNGI3MSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDEyLTEwLTA5ICBBbGV4aXMgTWVuYXJkICA8YWxleGlzQHdlYmtpdC5vcmc+CisKKyAg ICAgICAgW0dUS10gU2hhZG93IGJ1aWxkcyBhcmUgbm90IHdvcmtpbmcgYW55bW9yZS4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk4Nzg1CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTWFydGluIFJvYmluc29uLgorCisgICAgICAgIFdoZW4gc2V0dGluZyBX RUJLSVRPVVRQVVRESVIgdGhlIGJ1aWxkIHdhcyBmYWlsaW5nIHdpdGggYSBweXRob24KKyAgICAg ICAgZXJyb3IgOiB0aGUgb3MuZXhlY3ZlIGV4cGVjdCB0aHJlZSBhcmd1bWVudHMuIEFsc28gdGhl IGNvbmRpdGlvbgorICAgICAgICB0byBjaGVjayB3aGV0aGVyIHdlIGJ1aWxkIHRoZSBHVEsgcG9y dCB3aXRoIGpoYnVpbGQgb3Igbm90IHdhcyBidWdneQorICAgICAgICBhcyBpdCB3YXMgYWx3YXlz IGFzc3VtaW5nIGFuIGluIHNvdXJjZSBidWlsZC4gV2UgY2FuIHVzZSBub3cgamhidWlsZHV0aWxz CisgICAgICAgIHdoaWNoIGhhcyBhIGNvbnZlbmllbnQgZnVuY3Rpb24gdG8gbG9jYXRlIHRoZSBk aXJlY3Rvcnkgd2hlcmUgCisgICAgICAgIHRoZSBkZXBlbmRlbmNpZXMgYnVpbHQgd2l0aCBqaGJ1 aWxkIGFyZSBhbmQgdGFrZSBpbnRvIGFjY291bnQgV0VCS0lUT1VUUFVURElSLgorICAgICAgICBJ ZiB0aGUgRGVwZW5kZW5jaWVzIHBhdGggZG9lcyBub3QgZXhpc3QgdGhlbiB0aGUgYnVpbGQgd2Fz IG5vdCBkb25lIHVzaW5nCisgICAgICAgIGpoYnVpbGQgc28gd2UgY2FuIGZhbGxiYWNrIHRvIGEg cmVndWxhciBidWlsZCBhZ2FpbnN0IHN5c3RlbSBsaWJyYXJpZXMuCisKKyAgICAgICAgKiBndGsv cnVuLXdpdGgtamhidWlsZDoKKwogMjAxMi0xMC0wOCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJh c2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgRFJUL1dUUiBpbXBsZW1lbnRhdGlvbnMg b2YgbGF5ZXJUcmVlQXNUZXh0CmRpZmYgLS1naXQgYS9Ub29scy9ndGsvcnVuLXdpdGgtamhidWls ZCBiL1Rvb2xzL2d0ay9ydW4td2l0aC1qaGJ1aWxkCmluZGV4IDQ2NWFkM2ZiMWQwOTI2YjIzN2E5 YjQ0ZGY4ODc3M2JlY2RlZWU2YWQuLmE5YWZmZmZiOThjYjU5NjEwYTIxNjIwZDk2NTA0ZDkzZGMz OTE5ZDYgMTAwNzU1Ci0tLSBhL1Rvb2xzL2d0ay9ydW4td2l0aC1qaGJ1aWxkCisrKyBiL1Rvb2xz L2d0ay9ydW4td2l0aC1qaGJ1aWxkCkBAIC0yMiwxMCArMjIsMTEgQEAgaW1wb3J0IG9zCiBpbXBv cnQgc3VicHJvY2VzcwogaW1wb3J0IHN5cwogCi1iYXNlX2J1aWxkX2RpciA9IG9zLmdldGVudign V0VCS0lUT1VUUFVURElSJywgY29tbW9uLnRvcF9sZXZlbF9wYXRoKCdXZWJLaXRCdWlsZCcpKQor c3lzLnBhdGguYXBwZW5kKGNvbW1vbi50b3BfbGV2ZWxfcGF0aCgnVG9vbHMnLCAnamhidWlsZCcp KQoraW1wb3J0IGpoYnVpbGR1dGlscwogCi1pZiBub3Qgb3MucGF0aC5leGlzdHMob3MucGF0aC5q b2luKGJhc2VfYnVpbGRfZGlyLCAnRGVwZW5kZW5jaWVzJykpOgotICAgIG9zLmV4ZWN2ZShzeXMu YXJndlsxXSwgc3lzLmFyZ3ZbMV0pCitpZiAobm90IG9zLnBhdGguZXhpc3RzKGpoYnVpbGR1dGls cy5nZXRfZGVwZW5kZW5jaWVzX3BhdGgoKSkpOgorICAgIG9zLmV4ZWN2ZShzeXMuYXJndlsxXSwg c3lzLmFyZ3ZbMTpdLCBvcy5lbnZpcm9uKQogZWxzZToKICAgICB3cmFwcGVyID0gY29tbW9uLnRv cF9sZXZlbF9wYXRoKCdUb29scycsICdqaGJ1aWxkJywgJ2poYnVpbGQtd3JhcHBlcicpCiAgICAg b3MuZXhlY3ZlKHdyYXBwZXIsIFt3cmFwcGVyLCAnLS1ndGsnLCAncnVuJ10gKyBzeXMuYXJndlsx Ol0sIG9zLmVudmlyb24pCg==