Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.80) (envelope-from ) id 1aHZAi-0002LK-3v for pgadmin-hackers@arkaria.postgresql.org; Fri, 08 Jan 2016 15:41:48 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84) (envelope-from ) id 1aHZAh-0002lf-FE for pgadmin-hackers@arkaria.postgresql.org; Fri, 08 Jan 2016 15:41:47 +0000 Received: from makus.postgresql.org ([2001:4800:1501:1::229]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.84) (envelope-from ) id 1aHZAg-0002lZ-L8 for pgadmin-hackers@postgresql.org; Fri, 08 Jan 2016 15:41:46 +0000 Received: from mail-ig0-x236.google.com ([2607:f8b0:4001:c05::236]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84) (envelope-from ) id 1aHZAd-0001ND-GP for pgadmin-hackers@postgresql.org; Fri, 08 Jan 2016 15:41:45 +0000 Received: by mail-ig0-x236.google.com with SMTP id z14so77728690igp.0 for ; Fri, 08 Jan 2016 07:41:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pgadmin-org.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=ND4XsXhYT00rTWUoUlEV1A/3SHFzLz9/ZGGqwXtTKuw=; b=j3V4LLz43ak9U7wNZlrumUmVphv87nsJgtpKeBRu/+gIT0vkcTM+xsG++7eS3khDBx 2Yjo6782jvuhEC2fjjEy4tuXExwq0tOQTTvgixNBTUR6aAYnhm9ZZRE3r7DykZ35V2/2 2gN5dLcV80ZVFfF9HMqgEOKydDM7JjbGfmixGWCKzDsUp1BMQd7JsBJxIAjuH28uLfi7 nGUWSRKB5HDyD7KkTIs9I52bN1CTFI7c6a32hQRVIgsLb6hTH+Reu5Rk+eCJd1DfydBX YAIVJ0hVX5sVLtoLCcaEDpHmEFRtbQdiYyMJfJ3gNSHcE+uma+ASJnps/f08YzPQn0yM FUgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=ND4XsXhYT00rTWUoUlEV1A/3SHFzLz9/ZGGqwXtTKuw=; b=XepRD4wXk9SaumdRvwYTKyKX1KGtuMOikGAJq85Po/pWv/8A7Cr2WHXIeci/6mvtJs homassXs7J4/kVbD37EWDK48Xp7h6VkcCB9D/2GQGTQx0WDsyb3WUy1OjyTlirZTSvwd hRsRgGsCojXUHBEpJW5i/1+K98gkSCrLs0oakWx9jfM3IntsP1NZBNqTxDFWNUQl+VUi keoxUE2LDFaPuNGMx9Iy25jYYOSCUwybbBCr034/xVybpvYFN3LbluBZr4BhHIpjoa++ WPLft5+/7g5kj74f0vBkwLPCBJC6eE5bA4sMop5aiWcUhm5wQO/JbBT853S8d1V+gt4b X1eA== X-Gm-Message-State: ALoCoQlp/DJSTplFxbZATahRyoshL7aNgWeYyD4lc0ZjWqTF6YbGB/rV5GpARJVxWKYHTRkk39IuMW0SOKZgx/3f8h3pkqEzOg== MIME-Version: 1.0 X-Received: by 10.50.30.38 with SMTP id p6mr73595igh.69.1452267702221; Fri, 08 Jan 2016 07:41:42 -0800 (PST) Received: by 10.64.0.195 with HTTP; Fri, 8 Jan 2016 07:41:42 -0800 (PST) In-Reply-To: <568F53F4.60907@wars-nicht.de> References: <568E021A.4050407@wars-nicht.de> <568E798C.2090206@wars-nicht.de> <568F53F4.60907@wars-nicht.de> Date: Fri, 8 Jan 2016 15:41:42 +0000 Message-ID: Subject: Re: Updated Greenplum documentation From: Dave Page To: "Andreas 'ads' Scherbaum" Cc: pgadmin-hackers Content-Type: multipart/mixed; boundary=047d7bdc11dc82d2b80528d46c0f X-Pg-Spam-Score: -2.6 (--) List-Archive: List-Help: List-ID: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-Mailing-List: pgadmin-hackers Precedence: bulk Sender: pgadmin-hackers-owner@postgresql.org --047d7bdc11dc82d2b80528d46c0f Content-Type: text/plain; charset=UTF-8 On Fri, Jan 8, 2016 at 6:15 AM, Andreas 'ads' Scherbaum wrote: > On 07.01.2016 15:45, Dave Page wrote: >> >> On Thu, Jan 7, 2016 at 2:43 PM, Andreas 'ads' Scherbaum >> wrote: >>> >>> On 07.01.2016 13:49, Dave Page wrote: >>>> >>>> >>>> >>>> What did you create the patch against? >>> >>> >>> >>> HEAD from git.postgresql from like 2 days ago. >> >> >> Hmm, I would have expected that to work. Can you rebase it please, just in >> case? >> > > Just did that, and recreated the patch. Latest changes did not touch the > files I modified, the new patch has the same checksum. > Also, I can apply my patch to my working directory without any errors. > > Any idea why it is failing for you? Any reject files? I get the following rejects (see attached as well). I wonder if it's a line ending issue - what platform are you working on? piranha:pgadmin3 dpage$ git apply --reject ~/Downloads/gp-doc.diff /Users/dpage/Downloads/gp-doc.diff:9: trailing whitespace. path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-5.0\\bin")); /Users/dpage/Downloads/gp-doc.diff:10: trailing whitespace. path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.4\\bin")); /Users/dpage/Downloads/gp-doc.diff:18: trailing whitespace. path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-5.0\\lib")); /Users/dpage/Downloads/gp-doc.diff:19: trailing whitespace. path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.4\\lib")); /Users/dpage/Downloads/gp-doc.diff:27: trailing whitespace. path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-5.0\\bin")); Checking patch pgadmin/pgAdmin3.cpp... error: while searching for: // Ugly... Greenplum client releases have no predictable numbers, because the path is the server version if (!programFiles.IsEmpty()) { path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.3\\bin")); path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.2\\bin")); path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.1\\bin")); error: patch failed: pgadmin/pgAdmin3.cpp:1167 error: while searching for: path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-3.3\\bin")); path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-3.2\\bin")); path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.3\\lib")); path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.2\\lib")); path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.1\\lib")); error: patch failed: pgadmin/pgAdmin3.cpp:1174 error: while searching for: if (!programFilesX86.IsEmpty()) { path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-4.3\\bin")); path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-4.2\\bin")); path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-4.1\\bin")); error: patch failed: pgadmin/pgAdmin3.cpp:1184 error: while searching for: path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-3.3\\bin")); path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-3.2\\bin")); path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-4.3\\lib")); path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-4.2\\lib")); path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-4.1\\lib")); error: patch failed: pgadmin/pgAdmin3.cpp:1191 error: while searching for: // Generic Unix paths path.Add(wxT("/usr/local/greenplum-clients-4.3/bin")); path.Add(wxT("/opt/local/greenplum-clients-4.3/bin")); path.Add(wxT("/usr/local/greenplum-clients-4.2/bin")); error: patch failed: pgadmin/pgAdmin3.cpp:1206 error: while searching for: path.Add(wxT("/usr/local/greenplum-clients-3.2/bin")); path.Add(wxT("/opt/local/greenplum-clients-3.2/bin")); path.Add(wxT("/usr/local/greenplum-clients-4.3/lib")); path.Add(wxT("/opt/local/greenplum-clients-4.3/lib")); path.Add(wxT("/usr/local/greenplum-clients-4.2/lib")); error: patch failed: pgadmin/pgAdmin3.cpp:1219 error: while searching for: if (edbHelpPath.IsEmpty()) edbHelpPath = wxT("http://www.enterprisedb.com/docs/en/current/server/"); if (gpHelpPath.IsEmpty()) gpHelpPath = wxT("http://docs.gopivotal.com/gpdb/index.html"); if (slonyHelpPath.IsEmpty()) slonyHelpPath = wxT("http://www.slony.info/documentation/"); error: patch failed: pgadmin/pgAdmin3.cpp:1664 Checking patch pgadmin/utils/misc.cpp... error: while searching for: thePath.Lower().EndsWith(wxT(".zip"))) return thePath; // In all othe cases we must have a directory wxString sep; // Figure out the appropriate seperator error: patch failed: pgadmin/utils/misc.cpp:676 error: while searching for: // the old help path (stored in the settings) is no longer working static wxString gpHelpPath = settings->GetGpHelpPath(); if (gpHelpPath.CmpNoCase(wxT("http://www.greenplum.com/docs/3300/")) == 0) { gpHelpPath = wxT("http://docs.gopivotal.com/gpdb/"); // this is the old link, update the link to the new documentation link // problem: this saves the link into the configuration file settings->SetGpHelpPath(gpHelpPath); error: patch failed: pgadmin/utils/misc.cpp:764 Applying patch pgadmin/pgAdmin3.cpp with 7 rejects... Rejected hunk #1. Rejected hunk #2. Rejected hunk #3. Rejected hunk #4. Rejected hunk #5. Rejected hunk #6. Rejected hunk #7. Applying patch pgadmin/utils/misc.cpp with 2 rejects... Rejected hunk #1. Rejected hunk #2. -- Dave Page Blog: http://pgsnake.blogspot.com Twitter: @pgsnake EnterpriseDB UK: http://www.enterprisedb.com The Enterprise PostgreSQL Company --047d7bdc11dc82d2b80528d46c0f Content-Type: application/octet-stream; name="pgAdmin3.cpp.rej" Content-Disposition: attachment; filename="pgAdmin3.cpp.rej" Content-Transfer-Encoding: base64 X-Attachment-Id: f_ij5unjko0 ZGlmZiBhL3BnYWRtaW4vcGdBZG1pbjMuY3BwIGIvcGdhZG1pbi9wZ0FkbWlu My5jcHAJKHJlamVjdGVkIGh1bmtzKQpAQCAtMTE2Nyw2ICsxMTY3LDggQEAg dm9pZCBwZ0FkbWluMzo6SW5pdFh0cmFQYXRocygpDQogCQkvLyBVZ2x5Li4u IEdyZWVucGx1bSBjbGllbnQgcmVsZWFzZXMgaGF2ZSBubyBwcmVkaWN0YWJs ZSBudW1iZXJzLCBiZWNhdXNlIHRoZSBwYXRoIGlzIHRoZSBzZXJ2ZXIgdmVy c2lvbg0KIAkJaWYgKCFwcm9ncmFtRmlsZXMuSXNFbXB0eSgpKQ0KIAkJew0K KwkJCXBhdGguQWRkKHByb2dyYW1GaWxlcyArIHd4VCgiXFxHcmVlbnBsdW1c XGdyZWVucGx1bS1jbGllbnRzLTUuMFxcYmluIikpOw0KKwkJCXBhdGguQWRk KHByb2dyYW1GaWxlcyArIHd4VCgiXFxHcmVlbnBsdW1cXGdyZWVucGx1bS1j bGllbnRzLTQuNFxcYmluIikpOw0KIAkJCXBhdGguQWRkKHByb2dyYW1GaWxl cyArIHd4VCgiXFxHcmVlbnBsdW1cXGdyZWVucGx1bS1jbGllbnRzLTQuM1xc YmluIikpOw0KIAkJCXBhdGguQWRkKHByb2dyYW1GaWxlcyArIHd4VCgiXFxH cmVlbnBsdW1cXGdyZWVucGx1bS1jbGllbnRzLTQuMlxcYmluIikpOw0KIAkJ CXBhdGguQWRkKHByb2dyYW1GaWxlcyArIHd4VCgiXFxHcmVlbnBsdW1cXGdy ZWVucGx1bS1jbGllbnRzLTQuMVxcYmluIikpOw0KQEAgLTExNzQsNiArMTE3 Niw4IEBAIHZvaWQgcGdBZG1pbjM6OkluaXRYdHJhUGF0aHMoKQ0KIAkJCXBh dGguQWRkKHByb2dyYW1GaWxlcyArIHd4VCgiXFxHcmVlbnBsdW1cXGdyZWVu cGx1bS1jbGllbnRzLTMuM1xcYmluIikpOw0KIAkJCXBhdGguQWRkKHByb2dy YW1GaWxlcyArIHd4VCgiXFxHcmVlbnBsdW1cXGdyZWVucGx1bS1jbGllbnRz LTMuMlxcYmluIikpOw0KIA0KKwkJCXBhdGguQWRkKHByb2dyYW1GaWxlcyAr IHd4VCgiXFxHcmVlbnBsdW1cXGdyZWVucGx1bS1jbGllbnRzLTUuMFxcbGli IikpOw0KKwkJCXBhdGguQWRkKHByb2dyYW1GaWxlcyArIHd4VCgiXFxHcmVl bnBsdW1cXGdyZWVucGx1bS1jbGllbnRzLTQuNFxcbGliIikpOw0KIAkJCXBh dGguQWRkKHByb2dyYW1GaWxlcyArIHd4VCgiXFxHcmVlbnBsdW1cXGdyZWVu cGx1bS1jbGllbnRzLTQuM1xcbGliIikpOw0KIAkJCXBhdGguQWRkKHByb2dy YW1GaWxlcyArIHd4VCgiXFxHcmVlbnBsdW1cXGdyZWVucGx1bS1jbGllbnRz LTQuMlxcbGliIikpOw0KIAkJCXBhdGguQWRkKHByb2dyYW1GaWxlcyArIHd4 VCgiXFxHcmVlbnBsdW1cXGdyZWVucGx1bS1jbGllbnRzLTQuMVxcbGliIikp Ow0KQEAgLTExODQsNiArMTE4OCw4IEBAIHZvaWQgcGdBZG1pbjM6OkluaXRY dHJhUGF0aHMoKQ0KIA0KIAkJaWYgKCFwcm9ncmFtRmlsZXNYODYuSXNFbXB0 eSgpKQ0KIAkJew0KKwkJCXBhdGguQWRkKHByb2dyYW1GaWxlc1g4NiArIHd4 VCgiXFxHcmVlbnBsdW1cXGdyZWVucGx1bS1jbGllbnRzLTUuMFxcYmluIikp Ow0KKwkJCXBhdGguQWRkKHByb2dyYW1GaWxlc1g4NiArIHd4VCgiXFxHcmVl bnBsdW1cXGdyZWVucGx1bS1jbGllbnRzLTQuNFxcYmluIikpOw0KIAkJCXBh dGguQWRkKHByb2dyYW1GaWxlc1g4NiArIHd4VCgiXFxHcmVlbnBsdW1cXGdy ZWVucGx1bS1jbGllbnRzLTQuM1xcYmluIikpOw0KIAkJCXBhdGguQWRkKHBy b2dyYW1GaWxlc1g4NiArIHd4VCgiXFxHcmVlbnBsdW1cXGdyZWVucGx1bS1j bGllbnRzLTQuMlxcYmluIikpOw0KIAkJCXBhdGguQWRkKHByb2dyYW1GaWxl c1g4NiArIHd4VCgiXFxHcmVlbnBsdW1cXGdyZWVucGx1bS1jbGllbnRzLTQu MVxcYmluIikpOw0KQEAgLTExOTEsNiArMTE5Nyw4IEBAIHZvaWQgcGdBZG1p bjM6OkluaXRYdHJhUGF0aHMoKQ0KIAkJCXBhdGguQWRkKHByb2dyYW1GaWxl c1g4NiArIHd4VCgiXFxHcmVlbnBsdW1cXGdyZWVucGx1bS1jbGllbnRzLTMu M1xcYmluIikpOw0KIAkJCXBhdGguQWRkKHByb2dyYW1GaWxlc1g4NiArIHd4 VCgiXFxHcmVlbnBsdW1cXGdyZWVucGx1bS1jbGllbnRzLTMuMlxcYmluIikp Ow0KIA0KKwkJCXBhdGguQWRkKHByb2dyYW1GaWxlc1g4NiArIHd4VCgiXFxH cmVlbnBsdW1cXGdyZWVucGx1bS1jbGllbnRzLTUuMFxcbGliIikpOw0KKwkJ CXBhdGguQWRkKHByb2dyYW1GaWxlc1g4NiArIHd4VCgiXFxHcmVlbnBsdW1c XGdyZWVucGx1bS1jbGllbnRzLTQuNFxcbGliIikpOw0KIAkJCXBhdGguQWRk KHByb2dyYW1GaWxlc1g4NiArIHd4VCgiXFxHcmVlbnBsdW1cXGdyZWVucGx1 bS1jbGllbnRzLTQuM1xcbGliIikpOw0KIAkJCXBhdGguQWRkKHByb2dyYW1G aWxlc1g4NiArIHd4VCgiXFxHcmVlbnBsdW1cXGdyZWVucGx1bS1jbGllbnRz LTQuMlxcbGliIikpOw0KIAkJCXBhdGguQWRkKHByb2dyYW1GaWxlc1g4NiAr IHd4VCgiXFxHcmVlbnBsdW1cXGdyZWVucGx1bS1jbGllbnRzLTQuMVxcbGli IikpOw0KQEAgLTEyMDYsNiArMTIxNCwxMCBAQCB2b2lkIHBnQWRtaW4zOjpJ bml0WHRyYVBhdGhzKCkNCiANCiAJCS8vIEdlbmVyaWMgVW5peCBwYXRocw0K IA0KKwkJcGF0aC5BZGQod3hUKCIvdXNyL2xvY2FsL2dyZWVucGx1bS1jbGll bnRzLTUuMC9iaW4iKSk7DQorCQlwYXRoLkFkZCh3eFQoIi9vcHQvbG9jYWwv Z3JlZW5wbHVtLWNsaWVudHMtNS4wL2JpbiIpKTsNCisJCXBhdGguQWRkKHd4 VCgiL3Vzci9sb2NhbC9ncmVlbnBsdW0tY2xpZW50cy00LjQvYmluIikpOw0K KwkJcGF0aC5BZGQod3hUKCIvb3B0L2xvY2FsL2dyZWVucGx1bS1jbGllbnRz LTQuNC9iaW4iKSk7DQogCQlwYXRoLkFkZCh3eFQoIi91c3IvbG9jYWwvZ3Jl ZW5wbHVtLWNsaWVudHMtNC4zL2JpbiIpKTsNCiAJCXBhdGguQWRkKHd4VCgi L29wdC9sb2NhbC9ncmVlbnBsdW0tY2xpZW50cy00LjMvYmluIikpOw0KIAkJ cGF0aC5BZGQod3hUKCIvdXNyL2xvY2FsL2dyZWVucGx1bS1jbGllbnRzLTQu Mi9iaW4iKSk7DQpAQCAtMTIxOSw2ICsxMjMxLDEwIEBAIHZvaWQgcGdBZG1p bjM6OkluaXRYdHJhUGF0aHMoKQ0KIAkJcGF0aC5BZGQod3hUKCIvdXNyL2xv Y2FsL2dyZWVucGx1bS1jbGllbnRzLTMuMi9iaW4iKSk7DQogCQlwYXRoLkFk ZCh3eFQoIi9vcHQvbG9jYWwvZ3JlZW5wbHVtLWNsaWVudHMtMy4yL2JpbiIp KTsNCiANCisJCXBhdGguQWRkKHd4VCgiL3Vzci9sb2NhbC9ncmVlbnBsdW0t Y2xpZW50cy01LjAvbGliIikpOw0KKwkJcGF0aC5BZGQod3hUKCIvb3B0L2xv Y2FsL2dyZWVucGx1bS1jbGllbnRzLTUuMC9saWIiKSk7DQorCQlwYXRoLkFk ZCh3eFQoIi91c3IvbG9jYWwvZ3JlZW5wbHVtLWNsaWVudHMtNC40L2xpYiIp KTsNCisJCXBhdGguQWRkKHd4VCgiL29wdC9sb2NhbC9ncmVlbnBsdW0tY2xp ZW50cy00LjQvbGliIikpOw0KIAkJcGF0aC5BZGQod3hUKCIvdXNyL2xvY2Fs L2dyZWVucGx1bS1jbGllbnRzLTQuMy9saWIiKSk7DQogCQlwYXRoLkFkZCh3 eFQoIi9vcHQvbG9jYWwvZ3JlZW5wbHVtLWNsaWVudHMtNC4zL2xpYiIpKTsN CiAJCXBhdGguQWRkKHd4VCgiL3Vzci9sb2NhbC9ncmVlbnBsdW0tY2xpZW50 cy00LjIvbGliIikpOw0KQEAgLTE2NjQsNyArMTY4MCw3IEBAIHZvaWQgcGdB ZG1pbjM6OkluaXRIZWxwKCkNCiAJaWYgKGVkYkhlbHBQYXRoLklzRW1wdHko KSkNCiAJCWVkYkhlbHBQYXRoID0gd3hUKCJodHRwOi8vd3d3LmVudGVycHJp c2VkYi5jb20vZG9jcy9lbi9jdXJyZW50L3NlcnZlci8iKTsNCiAJaWYgKGdw SGVscFBhdGguSXNFbXB0eSgpKQ0KLQkJZ3BIZWxwUGF0aCA9IHd4VCgiaHR0 cDovL2RvY3MuZ29waXZvdGFsLmNvbS9ncGRiL2luZGV4Lmh0bWwiKTsNCisJ CWdwSGVscFBhdGggPSB3eFQoImh0dHA6Ly9ncGRiLmRvY3MucGl2b3RhbC5p by9zIik7DQogCWlmIChzbG9ueUhlbHBQYXRoLklzRW1wdHkoKSkNCiAJCXNs b255SGVscFBhdGggPSB3eFQoImh0dHA6Ly93d3cuc2xvbnkuaW5mby9kb2N1 bWVudGF0aW9uLyIpOw0KIA0K --047d7bdc11dc82d2b80528d46c0f Content-Type: application/octet-stream; name="misc.cpp.rej" Content-Disposition: attachment; filename="misc.cpp.rej" Content-Transfer-Encoding: base64 X-Attachment-Id: f_ij5uobrp1 ZGlmZiBhL3BnYWRtaW4vdXRpbHMvbWlzYy5jcHAgYi9wZ2FkbWluL3V0aWxz L21pc2MuY3BwCShyZWplY3RlZCBodW5rcykKQEAgLTY3Niw3ICs2NzYsNyBA QCB3eFN0cmluZyBDbGVhbkhlbHBQYXRoKGNvbnN0IHd4U3RyaW5nICZwYXRo KQ0KIAkgICAgICAgIHRoZVBhdGguTG93ZXIoKS5FbmRzV2l0aCh3eFQoIi56 aXAiKSkpDQogCQlyZXR1cm4gdGhlUGF0aDsNCiANCi0JLy8gSW4gYWxsIG90 aGUgY2FzZXMgd2UgbXVzdCBoYXZlIGEgZGlyZWN0b3J5DQorCS8vIEluIGFs bCBvdGhlciBjYXNlcyB3ZSBtdXN0IGhhdmUgYSBkaXJlY3RvcnkNCiAJd3hT dHJpbmcgc2VwOw0KIA0KIAkvLyBGaWd1cmUgb3V0IHRoZSBhcHByb3ByaWF0 ZSBzZXBlcmF0b3INCkBAIC03NjQsOSArNzY0LDIxIEBAIHZvaWQgRGlzcGxh eUhlbHAoY29uc3Qgd3hTdHJpbmcgJmhlbHBUb3BpYywgY29uc3QgSGVscFR5 cGUgaGVscFR5cGUpDQogCQkJLy8gdGhlIG9sZCBoZWxwIHBhdGggKHN0b3Jl ZCBpbiB0aGUgc2V0dGluZ3MpIGlzIG5vIGxvbmdlciB3b3JraW5nDQogCQkJ c3RhdGljIHd4U3RyaW5nIGdwSGVscFBhdGggPSBzZXR0aW5ncy0+R2V0R3BI ZWxwUGF0aCgpOw0KIA0KKwkJCS8vIE5vdGU6IG5ldmVyIGVuZCB0aGUgVVJM IG9uICJpbmRleC5odG1sIg0KKwkJCS8vIEluaXRIZWxwKCkgZG9lcyBvYnNj dXJlIG1hZ2ljIHdpdGggdGhpcyBlbmRpbmcNCisJCQlpZiAoZ3BIZWxwUGF0 aC5DbXBOb0Nhc2Uod3hUKCJodHRwOi8vZG9jcy5nb3Bpdm90YWwuY29tL2dw ZGIvIikpID09IDApDQorCQkJew0KKwkJCQlncEhlbHBQYXRoID0gd3hUKCJo dHRwOi8vZ3BkYi5kb2NzLnBpdm90YWwuaW8vIik7DQorCQkJCS8vIFJlcGxh Y2UgdGhlIHBhdGggdG8gdGhlIG9sZCBkb21haW4gd2l0aCB0aGUgbGluayB0 bw0KKwkJCQkvLyB0aGUgbmV3IGRvY3VtZW50YXRpb24gcGF0aA0KKwkJCQkv LyBUaGUgb2xkIGxpbmsgaXMgd29ya2luZyBmb3Igbm93LCBidXQgdGhlcmUg aXMgbm8gZ3VhcmFudGVlDQorCQkJCS8vIHRoYXQgaXQgd2lsbCBzdGF5IHRo aXMgd2F5DQorCQkJCS8vIEFsc28gdGhlIG5ldyBsaW5rIGF1dG9tYXRpY2Fs bHkgcmVkaXJlY3RzIHRvIHRoZSBsYXRlc3QgdmVyc2lvbg0KKwkJCQlzZXR0 aW5ncy0+U2V0R3BIZWxwUGF0aChncEhlbHBQYXRoKTsNCisJCQl9DQogCQkJ aWYgKGdwSGVscFBhdGguQ21wTm9DYXNlKHd4VCgiaHR0cDovL3d3dy5ncmVl bnBsdW0uY29tL2RvY3MvMzMwMC8iKSkgPT0gMCkNCiAJCQl7DQotCQkJCWdw SGVscFBhdGggPSB3eFQoImh0dHA6Ly9kb2NzLmdvcGl2b3RhbC5jb20vZ3Bk Yi8iKTsNCisJCQkJZ3BIZWxwUGF0aCA9IHd4VCgiaHR0cDovL2dwZGIuZG9j cy5waXZvdGFsLmlvLyIpOw0KIAkJCQkvLyB0aGlzIGlzIHRoZSBvbGQgbGlu aywgdXBkYXRlIHRoZSBsaW5rIHRvIHRoZSBuZXcgZG9jdW1lbnRhdGlvbiBs aW5rDQogCQkJCS8vIHByb2JsZW06IHRoaXMgc2F2ZXMgdGhlIGxpbmsgaW50 byB0aGUgY29uZmlndXJhdGlvbiBmaWxlDQogCQkJCXNldHRpbmdzLT5TZXRH cEhlbHBQYXRoKGdwSGVscFBhdGgpOw0K --047d7bdc11dc82d2b80528d46c0f Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgadmin-hackers --047d7bdc11dc82d2b80528d46c0f--