diff options
| author | Robin Gloster <mail@glob.in> | 2021-08-02 17:08:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-02 17:08:40 +0200 |
| commit | 15ffca434eb8c47d472c3508abe10616022b31a4 (patch) | |
| tree | b0e73ab8b0c835d2a3c6fe6dfecb547d81661cc4 /pkgs/tools/admin/google-cloud-sdk/cloud_sql_proxy_path.patch | |
| parent | a476da069049bbdd1630ba1bc66e0ba0512cff15 (diff) | |
| parent | 5701e5bc3bfb317e1f37ff3fb889eae7584a1206 (diff) | |
| download | nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.gz nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.bz2 nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.lz nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.xz nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.zst nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.zip | |
Merge branch 'master' into meshcentral
Diffstat (limited to 'pkgs/tools/admin/google-cloud-sdk/cloud_sql_proxy_path.patch')
| -rw-r--r-- | pkgs/tools/admin/google-cloud-sdk/cloud_sql_proxy_path.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/admin/google-cloud-sdk/cloud_sql_proxy_path.patch b/pkgs/tools/admin/google-cloud-sdk/cloud_sql_proxy_path.patch index aec4be2ec19..f92896e81c9 100644 --- a/pkgs/tools/admin/google-cloud-sdk/cloud_sql_proxy_path.patch +++ b/pkgs/tools/admin/google-cloud-sdk/cloud_sql_proxy_path.patch @@ -2,7 +2,7 @@ diff --git a/lib/googlecloudsdk/api_lib/sql/instances.py b/lib/googlecloudsdk/ap index 0d88ffe..814a436 100644 --- a/lib/googlecloudsdk/api_lib/sql/instances.py +++ b/lib/googlecloudsdk/api_lib/sql/instances.py -@@ -86,18 +86,19 @@ def GetRegionFromZone(gce_zone): +@@ -85,18 +85,19 @@ def GetRegionFromZone(gce_zone): def _GetCloudSqlProxyPath(): """Determines the path to the cloud_sql_proxy binary.""" sdk_bin_path = config.Paths().sdk_bin_path @@ -14,7 +14,7 @@ index 0d88ffe..814a436 100644 - 'Using cloud_sql_proxy found at [{path}]'.format(path=proxy_path)) - return proxy_path - else: -- raise exceptions.ToolException( +- raise sql_exceptions.SqlProxyNotFound( - 'A Cloud SQL Proxy SDK root could not be found. Please check your ' - 'installation.') - return os.path.join(sdk_bin_path, 'cloud_sql_proxy') @@ -28,7 +28,7 @@ index 0d88ffe..814a436 100644 + 'Using cloud_sql_proxy found at [{path}]'.format(path=proxy_path)) + return proxy_path + -+ raise exceptions.ToolException( ++ raise sql_exceptions.SqlProxyNotFound( + 'A Cloud SQL Proxy SDK root could not be found. Please check your ' + 'installation.') |