From 5d6199b9251261216cb096cd919e3cc5eb3efdd6 Mon Sep 17 00:00:00 2001
From: shin- <joffrey@dotcloud.com>
Date: Mon, 11 Mar 2013 07:39:06 -0700
Subject: [PATCH] post-merge repairs

---
 client/client.go | 4 ++--
 container.go     | 1 -
 docker/docker.go | 2 +-
 server/server.go | 6 +++---
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/client/client.go b/client/client.go
index 4c4ea1c5e..a277a4b18 100644
--- a/client/client.go
+++ b/client/client.go
@@ -1,8 +1,8 @@
 package client
 
 import (
-	"github.com/dotcloud/docker/future"
-	"github.com/dotcloud/docker/rcli"
+	"../future"
+	"../rcli"
 	"io"
 	"io/ioutil"
 	"log"
diff --git a/container.go b/container.go
index 21f4d5492..52a330621 100644
--- a/container.go
+++ b/container.go
@@ -2,7 +2,6 @@ package docker
 
 import (
 	"./fs"
-	"bytes"
 	"encoding/json"
 	"errors"
 	"github.com/kr/pty"
diff --git a/docker/docker.go b/docker/docker.go
index fa9011def..df8a09443 100644
--- a/docker/docker.go
+++ b/docker/docker.go
@@ -1,8 +1,8 @@
 package main
 
 import (
+	"../client"
 	"flag"
-	"github.com/dotcloud/docker/client"
 	"log"
 	"os"
 	"path"
diff --git a/server/server.go b/server/server.go
index b091913e0..c403ed187 100644
--- a/server/server.go
+++ b/server/server.go
@@ -434,7 +434,7 @@ func (srv *Server) CmdPull(stdin io.ReadCloser, stdout io.Writer, args ...string
 		}
 	}
 	fmt.Fprintf(stdout, "Unpacking to %s\n", name)
-	img, err := srv.images.Create(resp.Body, nil, name, "")
+	img, err := srv.images.Create(archive, nil, name, "")
 	if err != nil {
 		return err
 	}
@@ -614,7 +614,7 @@ func (srv *Server) CmdCommit(stdin io.ReadCloser, stdout io.Writer, args ...stri
 	}
 	if container := srv.containers.Get(containerName); container != nil {
 		// FIXME: freeze the container before copying it to avoid data corruption?
-		rwTar, err := docker.Tar(container.Mountpoint.Rw)
+		rwTar, err := fs.Tar(container.Mountpoint.Rw, fs.Uncompressed)
 		if err != nil {
 			return err
 		}
@@ -651,7 +651,7 @@ func (srv *Server) CmdTar(stdin io.ReadCloser, stdout io.Writer, args ...string)
 		if err := container.Mountpoint.EnsureMounted(); err != nil {
 			return err
 		}
-		data, err := docker.Tar(container.Mountpoint.Root)
+		data, err := fs.Tar(container.Mountpoint.Root, fs.Uncompressed)
 		if err != nil {
 			return err
 		}