From b2aa877bf0a3f140516d1c17117369b2194f2b91 Mon Sep 17 00:00:00 2001
From: Victor Vieux <victor.vieux@dotcloud.com>
Date: Mon, 29 Jul 2013 16:40:35 +0000
Subject: [PATCH] fix #1314 discard error when loading old container format

---
 container.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/container.go b/container.go
index d0b6ca4ce2..cbcd3f17fa 100644
--- a/container.go
+++ b/container.go
@@ -266,7 +266,8 @@ func (container *Container) FromDisk() error {
 		return err
 	}
 	// Load container settings
-	if err := json.Unmarshal(data, container); err != nil {
+	// udp broke compat of docker.PortMapping, but it's not used when loading a container, we can skip it
+	if err := json.Unmarshal(data, container); err != nil && !strings.Contains(err.Error(), "docker.PortMapping") {
 		return err
 	}
 	return nil