github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-10-31 16:58:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1571 from dave-tucker/panic

Browse Source 
Fix panic in gcp code
This commit is contained in:
Justin Cormack
2017-04-10 17:37:52 +01:00
committed by GitHub
parent 84034a0370 0ece2e8227
commit 46799eb2de
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cmd/moby/gcp.go
View File

@@ -159,6 +159,9 @@ func (g GCPClient) DeleteImage(name string) error {
var notFound bool var notFound bool
op, err := g.compute.Images.Delete(g.projectName, name).Do() op, err := g.compute.Images.Delete(g.projectName, name).Do()
if err != nil { if err != nil {
if _, ok := err.(*googleapi.Error); !ok {
return err
}
if err.(*googleapi.Error).Code != 404 { if err.(*googleapi.Error).Code != 404 {
return err return err
} }
@@ -240,6 +243,9 @@ func (g GCPClient) DeleteInstance(instance, zone string, wait bool) error {
var notFound bool var notFound bool
op, err := g.compute.Instances.Delete(g.projectName, zone, instance).Do() op, err := g.compute.Instances.Delete(g.projectName, zone, instance).Do()
if err != nil { if err != nil {
if _, ok := err.(*googleapi.Error); !ok {
return err
}
if err.(*googleapi.Error).Code != 404 { if err.(*googleapi.Error).Code != 404 {
return err return err
} }