From 27107fdac1d75f97caab47cd13efb1d9900cf350 Mon Sep 17 00:00:00 2001
From: umohnani8 <umohnani@redhat.com>
Date: Wed, 18 Apr 2018 16:48:35 -0400
Subject: Vendor in latest containers/image and contaners/storage

Made necessary changes to functions to include contex.Context wherever needed

Signed-off-by: umohnani8 <umohnani@redhat.com>

Closes: #640
Approved by: baude
---
 cmd/podman/common.go | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'cmd/podman/common.go')

diff --git a/cmd/podman/common.go b/cmd/podman/common.go
index 755285c95..9ee99bebc 100644
--- a/cmd/podman/common.go
+++ b/cmd/podman/common.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"reflect"
 	"regexp"
 	"strings"
@@ -67,6 +68,11 @@ func validateFlags(c *cli.Context, flags []cli.Flag) error {
 	return nil
 }
 
+// getContext returns a non-nil, empty context
+func getContext() context.Context {
+	return context.TODO()
+}
+
 // Common flags shared between commands
 var createFlags = []cli.Flag{
 	cli.StringSliceFlag{
-- 
cgit v1.2.3-54-g00ecf