From 3e4e8636c1b05626cae720b47ef99109077e1d3a Mon Sep 17 00:00:00 2001
From: Victor Vieux <vieux@docker.com>
Date: Tue, 17 Jun 2014 00:06:21 +0000
Subject: [PATCH] do not alter json in docker save

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
---
 api/server/server.go | 4 ++--
 daemon/inspect.go    | 2 +-
 graph/service.go     | 2 +-
 server/server.go     | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/api/server/server.go b/api/server/server.go
index 61407b2648..c6275177bc 100644
--- a/api/server/server.go
+++ b/api/server/server.go
@@ -855,7 +855,7 @@ func getContainersByName(eng *engine.Engine, version version.Version, w http.Res
 	}
 	var job = eng.Job("container_inspect", vars["name"])
 	if version.LessThan("1.12") {
-		job.SetenvBool("dirty", true)
+		job.SetenvBool("raw", true)
 	}
 	streamJSON(job, w, false)
 	return job.Run()
@@ -867,7 +867,7 @@ func getImagesByName(eng *engine.Engine, version version.Version, w http.Respons
 	}
 	var job = eng.Job("image_inspect", vars["name"])
 	if version.LessThan("1.12") {
-		job.SetenvBool("dirty", true)
+		job.SetenvBool("raw", true)
 	}
 	streamJSON(job, w, false)
 	return job.Run()
diff --git a/daemon/inspect.go b/daemon/inspect.go
index af6d4520fb..6c4b74d6f2 100644
--- a/daemon/inspect.go
+++ b/daemon/inspect.go
@@ -15,7 +15,7 @@ func (daemon *Daemon) ContainerInspect(job *engine.Job) engine.Status {
 	if container := daemon.Get(name); container != nil {
 		container.Lock()
 		defer container.Unlock()
-		if job.GetenvBool("dirty") {
+		if job.GetenvBool("raw") {
 			b, err := json.Marshal(&struct {
 				*Container
 				HostConfig *runconfig.HostConfig
diff --git a/graph/service.go b/graph/service.go
index 4bce6b5645..ebdb881603 100644
--- a/graph/service.go
+++ b/graph/service.go
@@ -135,7 +135,7 @@ func (s *TagStore) CmdLookup(job *engine.Job) engine.Status {
 	}
 	name := job.Args[0]
 	if image, err := s.LookupImage(name); err == nil && image != nil {
-		if job.GetenvBool("dirty") {
+		if job.GetenvBool("raw") {
 			b, err := json.Marshal(image)
 			if err != nil {
 				return job.Error(err)
diff --git a/server/server.go b/server/server.go
index 76a51e796f..b054911ed8 100644
--- a/server/server.go
+++ b/server/server.go
@@ -433,6 +433,7 @@ func (srv *Server) exportImage(eng *engine.Engine, name, tempdir string) error {
 			return err
 		}
 		job := eng.Job("image_inspect", n)
+		job.SetenvBool("raw", true)
 		job.Stdout.Add(json)
 		if err := job.Run(); err != nil {
 			return err