From dd498b264c6e8d09382dfa5eb615f8d4921ed6db Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Fri, 28 Nov 2014 11:12:50 -0800
Subject: [PATCH] appc: fix actool build error

---
 app-container/aci/layout.go      | 4 ++--
 app-container/actool/build.go    | 3 ++-
 app-container/fileset/fileset.go | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app-container/aci/layout.go b/app-container/aci/layout.go
index b5f9c4e..7254e3d 100644
--- a/app-container/aci/layout.go
+++ b/app-container/aci/layout.go
@@ -2,9 +2,9 @@ package aci
 
 /*
 
-Filesystem Layout
+Image Layout
 
-The on-disk format is straightforward, with a rootfs and an app manifest.
+The on-disk layout of an app container is straightforward. It includes a rootfs with all of the files that will exist in the root of the app and an app manifest describing how to execute the app.
 
 /app
 /rootfs
diff --git a/app-container/actool/build.go b/app-container/actool/build.go
index 6352dd6..dda8ae2 100644
--- a/app-container/actool/build.go
+++ b/app-container/actool/build.go
@@ -81,7 +81,8 @@ func runBuild(args []string) (exit int) {
 	tgt := args[1]
 	ext := filepath.Ext(tgt)
 	if ext != schema.ACIExtension {
-		stderr("fileset: Extension must be %s was %s", schema.ACIExtension, ext)
+		stderr("fileset: Extension must be %s (given %s)", schema.ACIExtension, ext)
+		return 1
 	}
 
 	fsm := schema.NewFileSetManifest(buildName)
diff --git a/app-container/fileset/fileset.go b/app-container/fileset/fileset.go
index 8c64e5b..03dee45 100644
--- a/app-container/fileset/fileset.go
+++ b/app-container/fileset/fileset.go
@@ -9,6 +9,7 @@ import (
 	"github.com/coreos-inc/rkt/app-container/schema"
 )
 
+// ArchiveWriter builds a fileset app container image
 type ArchiveWriter struct {
 	*tar.Writer
 	manifest *schema.FileSetManifest