Merge pull request #792 from dotcloud/780-diff-fix
- Runtime: fix Path corruption in 'docker diff'
diff --git a/changes.go b/changes.go
index 4c79918..e50b887 100644
--- a/changes.go
+++ b/changes.go
@@ -65,7 +65,7 @@
file := filepath.Base(path)
// If there is a whiteout, then the file was removed
if strings.HasPrefix(file, ".wh.") {
- originalFile := strings.TrimLeft(file, ".wh.")
+ originalFile := strings.TrimPrefix(file, ".wh.")
change.Path = filepath.Join(filepath.Dir(path), originalFile)
change.Kind = ChangeDelete
} else {
diff --git a/container_test.go b/container_test.go
index 3ed1763..117f0f3 100644
--- a/container_test.go
+++ b/container_test.go
@@ -217,6 +217,37 @@
t.Fatalf("/etc/passwd should not be present in the diff after commit.")
}
}
+
+ // Create a new containere
+ container3, err := builder.Create(
+ &Config{
+ Image: GetTestImage(runtime).Id,
+ Cmd: []string{"rm", "/bin/httpd"},
+ },
+ )
+ if err != nil {
+ t.Fatal(err)
+ }
+ defer runtime.Destroy(container3)
+
+ if err := container3.Run(); err != nil {
+ t.Fatal(err)
+ }
+
+ // Check the changelog
+ c, err = container3.Changes()
+ if err != nil {
+ t.Fatal(err)
+ }
+ success = false
+ for _, elem := range c {
+ if elem.Path == "/bin/httpd" && elem.Kind == 2 {
+ success = true
+ }
+ }
+ if !success {
+ t.Fatalf("/bin/httpd should be present in the diff after commit.")
+ }
}
func TestCommitAutoRun(t *testing.T) {
