From ba0017595ed9ac30273832b93365b0cb1cf60c05 Mon Sep 17 00:00:00 2001
From: Antonio Murdaca <me@runcom.ninja>
Date: Tue, 21 Apr 2015 19:59:45 +0200
Subject: [PATCH] Remove job image_tarlayer

Signed-off-by: Antonio Murdaca <me@runcom.ninja>
---
 graph/export.go  |  4 +---
 graph/service.go | 25 ++++++++++---------------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/graph/export.go b/graph/export.go
index f689ba10ef..2450d50273 100644
--- a/graph/export.go
+++ b/graph/export.go
@@ -139,9 +139,7 @@ func (s *TagStore) exportImage(eng *engine.Engine, name, tempdir string) error {
 		if err != nil {
 			return err
 		}
-		job = eng.Job("image_tarlayer", n)
-		job.Stdout.Add(fsTar)
-		if err := job.Run(); err != nil {
+		if err := s.ImageTarLayer(n, fsTar); err != nil {
 			return err
 		}
 
diff --git a/graph/service.go b/graph/service.go
index e16d4ac04f..007a57d134 100644
--- a/graph/service.go
+++ b/graph/service.go
@@ -11,14 +11,13 @@ import (
 
 func (s *TagStore) Install(eng *engine.Engine) error {
 	for name, handler := range map[string]engine.Handler{
-		"image_set":      s.CmdSet,
-		"image_get":      s.CmdGet,
-		"image_inspect":  s.CmdLookup,
-		"image_tarlayer": s.CmdTarLayer,
-		"image_export":   s.CmdImageExport,
-		"viz":            s.CmdViz,
-		"load":           s.CmdLoad,
-		"push":           s.CmdPush,
+		"image_set":     s.CmdSet,
+		"image_get":     s.CmdGet,
+		"image_inspect": s.CmdLookup,
+		"image_export":  s.CmdImageExport,
+		"viz":           s.CmdViz,
+		"load":          s.CmdLoad,
+		"push":          s.CmdPush,
 	} {
 		if err := eng.Register(name, handler); err != nil {
 			return fmt.Errorf("Could not register %q: %v", name, err)
@@ -152,12 +151,8 @@ func (s *TagStore) CmdLookup(job *engine.Job) error {
 	return fmt.Errorf("No such image: %s", name)
 }
 
-// CmdTarLayer return the tarLayer of the image
-func (s *TagStore) CmdTarLayer(job *engine.Job) error {
-	if len(job.Args) != 1 {
-		return fmt.Errorf("usage: %s NAME", job.Name)
-	}
-	name := job.Args[0]
+// ImageTarLayer return the tarLayer of the image
+func (s *TagStore) ImageTarLayer(name string, dest io.Writer) error {
 	if image, err := s.LookupImage(name); err == nil && image != nil {
 		fs, err := image.TarLayer()
 		if err != nil {
@@ -165,7 +160,7 @@ func (s *TagStore) CmdTarLayer(job *engine.Job) error {
 		}
 		defer fs.Close()
 
-		written, err := io.Copy(job.Stdout, fs)
+		written, err := io.Copy(dest, fs)
 		if err != nil {
 			return err
 		}