From 756df27e45f2e5d9033058f60afa9547239af1d6 Mon Sep 17 00:00:00 2001
From: "Guillaume J. Charmes" <guillaume.charmes@dotcloud.com>
Date: Thu, 2 May 2013 01:18:48 -0700
Subject: [PATCH] Add compatibility with contrib builder

---
 builder.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/builder.go b/builder.go
index e7f5e330f..19c24c901 100644
--- a/builder.go
+++ b/builder.go
@@ -204,7 +204,7 @@ func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) (*Image, e
 			}
 			return err
 		}
-		line = strings.TrimSpace(line)
+		line = strings.Replace(strings.TrimSpace(line), "	", " ", 1)
 		// Skip comments and empty line
 		if len(line) == 0 || line[0] == '#' {
 			continue
@@ -328,7 +328,7 @@ func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) (*Image, e
 			fmt.Fprintf(stdout, "===> %s\n", base.ShortId())
 			break
 		default:
-			fmt.Fprintf(stdout, "Skipping unknown op %s\n", tmp[0])
+			fmt.Fprintf(stdout, "Skipping unknown instruction %s\n", strings.ToUpper(instruction))
 		}
 	}
 	if image != nil {