Merge pull request #575 from odk-/notrunc-container-id

full container.Id display when notrunc is used Upstream-commit: d270501de21c026f06cd133a84ce11d20dd64bd8 Component: engine
2013-05-10 11:35:20 -07:00
parent ed0c3f4233 603152d01a
commit da4960c20a
1 changed files with 6 additions and 1 deletions
--- a/components/engine/server.go
+++ b/components/engine/server.go
@ -262,7 +262,12 @@ func (srv *Server) Containers(all, trunc_cmd, only_ids bool, n int, since, befor
 		displayed++

 		c := ApiContainers{
-			Id: container.ShortId(),
+			Id: container.Id,
+		}
+		if trunc_cmd {
+			c = ApiContainers{
+				Id: container.ShortId(),
+			}
 		}

 		if !only_ids {