Merge pull request #66 from rgooch/master

imagetool: fix panic in patch-directory subcommand when image not found.
Cloud-Foundations · Apr 12, 2020 · d8f7d12 · d8f7d12
2 parents 835d167 + 3cd26e6
commit d8f7d12
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/cmd/imagetool/diffImages.go b/cmd/imagetool/diffImages.go
@@ -103,7 +103,9 @@ func getImage(client *srpc.Client, name string) (*image.Image, error) {
 	if img == nil {
 		return nil, errors.New(name + ": not found")
 	}
-	img.FileSystem.RebuildInodePointers()
+	if err := img.FileSystem.RebuildInodePointers(); err != nil {
+		return nil, err
+	}
 	return img, nil
 }
 

diff --git a/cmd/imagetool/patchDirectory.go b/cmd/imagetool/patchDirectory.go
@@ -12,7 +12,6 @@ import (
 	"time"
 
 	domlib "github.com/Cloud-Foundations/Dominator/dom/lib"
-	imgclient "github.com/Cloud-Foundations/Dominator/imageserver/client"
 	"github.com/Cloud-Foundations/Dominator/lib/filesystem/scanner"
 	"github.com/Cloud-Foundations/Dominator/lib/format"
 	"github.com/Cloud-Foundations/Dominator/lib/fsutil"
@@ -37,7 +36,7 @@ func patchDirectorySubcommand(args []string, logger log.DebugLogger) error {
 func patchDirectory(imageName, dirName string, logger log.DebugLogger) error {
 	imageSClient, objectClient := getClients()
 	logger.Debugf(0, "getting image: %s\n", imageName)
-	img, err := imgclient.GetImage(imageSClient, imageName)
+	img, err := getImage(imageSClient, imageName)
 	if err != nil {
 		return err
 	}