From patchwork Mon Jun 4 14:51:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 137638 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1613058lji; Mon, 4 Jun 2018 07:52:07 -0700 (PDT) X-Google-Smtp-Source: ADUXVKI7a0RquMTjhFWt7pe5EpsH0ANm8dPvZzPcblhiG+6OmpqQzhHm1d4oPAf5uT9b2SruO89v X-Received: by 2002:a0c:d28f:: with SMTP id q15-v6mr20170823qvh.65.1528123927599; Mon, 04 Jun 2018 07:52:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528123927; cv=none; d=google.com; s=arc-20160816; b=02SrpcCMSRRw1NbJM0O19/gNfmt8kGtDefbeiSKezRSxOu9oNs4xnMFcln6fjUhtpZ E0fSEi0+t6qdZs+7KFc4f/sc7xysgUTsmvoxWCuImYjpOTqTsllHj3f4KwnbQIJDWRKS XNegSx7qMwFBx3KrJZHsopwQSxYaRq4aCbi0G5UqoB49crdokCjgL3nBQxvklJnBwdKl SLw37DApH+CKMFfzppZDCFJnldnmq9VlTPMWWm+mMykNLOst3bNfyTjTSOVJrQwub8F4 RIKXX70vDRPoF9wD+MVp+M4wtRf3de9hLNG2US8PIVuhwNnGc356v/7bqfUCTUrceVL+ HQkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=icyhNd5KQavNcvfAeUvX27EOWr3MXvhI7RrpNDKrgu0=; b=vBDqjYX0/cHH+bWWZir/ZYJEEA6iDhWYu8NntXemrwhrWqc1Xt3D/UEcJlV4qDmBmw 0E/z97t7UzEsCC1iRrCKlLq21yfm57b8Va7Rrh+lFxEiPyDpuQZuWy6rZOCnS0SIoBqi FxYgXMpg7hfsmOAkNf1vGDc/63EDyDQ9qoxmqIqGau5nTEb4fdpcDXQzekE8IrgA0p3h URdLM239NZQtm+Big+hTf4FlMxlB69siUbABC9hQerzW2mnPLo6OqX5HZPc4mS+gaFqD /nPOjf59LO6Kezi6i6o39SFBgXyLa71gBwumO03yX4/NahFg7ahOrcFzUDg8s0z8LXT9 xodQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=EZQCJhUJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 141-v6si3648232qki.314.2018.06.04.07.52.07 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 04 Jun 2018 07:52:07 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=EZQCJhUJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:40159 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fPqq7-0003DD-3A for patch@linaro.org; Mon, 04 Jun 2018 10:52:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58580) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fPqpJ-0002na-67 for qemu-devel@nongnu.org; Mon, 04 Jun 2018 10:51:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fPqpE-0003wz-8o for qemu-devel@nongnu.org; Mon, 04 Jun 2018 10:51:17 -0400 Received: from mail-wr0-x234.google.com ([2a00:1450:400c:c0c::234]:34143) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fPqpE-0003wJ-1D for qemu-devel@nongnu.org; Mon, 04 Jun 2018 10:51:12 -0400 Received: by mail-wr0-x234.google.com with SMTP id a12-v6so9341650wro.1 for ; Mon, 04 Jun 2018 07:51:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=icyhNd5KQavNcvfAeUvX27EOWr3MXvhI7RrpNDKrgu0=; b=EZQCJhUJTHUil9B7exi7wAuNjylpUeb+PyYzxdiCdd/6rbh/LCu8OCQ9I+k+1lekOP sUowbaozbykHifYtM9qSguZsK1P1+w0gSnBzUKSTNG893Qt0W0NCnLYnKD6+KWQicecf XJreHPj5/svZBuFTKZroI8RX0UH5HwHbiths8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=icyhNd5KQavNcvfAeUvX27EOWr3MXvhI7RrpNDKrgu0=; b=bDiZ3bhbe/VuV+oHRPJmSnBtv9xKFhRQMvU/D87Uq/HIo4PReiwJlP/4F/25fJda60 IqvNtEJGaytHOtQnjgyWOKpwC98Z8hmPpI9B2MHxbCHVdvl3MyMUaM3kcyqThja0UoKG 6K7rGA2+G7ZxDUUF447ADryWUU9oUBjNNJpcgyOD2IL0FTKNA6EAiEE3KSSuIOg65chn KOZ4vUwbixcwYhrgYRyHhA7sDadCCZh1OgxKD8FyNnQ3uXnFZyCH+79m3vKqjyPrFAuI O93BzQGhFa4nZIgTrHaQ+XFv7NGCa/bHkrfLbM2eYlM+VgrP3HWUSwSDnPhREVtZoKjl KUPw== X-Gm-Message-State: APt69E1/kGBY50FckbBJGt3Hd8/udKs/ODFEwqTpSVmpmYZJZ3NSxmxf /wSzOWcJ7eUiyUgY9zOFt9/0Tw== X-Received: by 2002:adf:e084:: with SMTP id c4-v6mr482139wri.199.1528123870763; Mon, 04 Jun 2018 07:51:10 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id a14-v6sm290769wmb.44.2018.06.04.07.51.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 Jun 2018 07:51:09 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 32D663E0971; Mon, 4 Jun 2018 15:51:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de, pbonzini@redhat.com, stefanha@redhat.com, stefanb@linux.vnet.ibm.com, marcandre.lureau@redhat.com Date: Mon, 4 Jun 2018 15:51:03 +0100 Message-Id: <20180604145109.30498-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180604145109.30498-1-alex.bennee@linaro.org> References: <20180604145109.30498-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::234 Subject: [Qemu-devel] [PATCH v1 1/7] docker: add "probe" command for configure X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is a helper function for the configure script. It replies yes, sudo or no to inform the user if non-interactive docker support is available. We trap the Exception to fail gracefully. Signed-off-by: Alex Bennée Reviewed-by: Fam Zheng --- tests/docker/docker.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) -- 2.17.0 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 1246ba9578..f8267586eb 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -390,6 +390,24 @@ class ImagesCommand(SubCommand): def run(self, args, argv): return Docker().command("images", argv, args.quiet) + +class ProbeCommand(SubCommand): + """Probe if we can run docker automatically""" + name = "probe" + + def run(self, args, argv): + try: + docker = Docker() + if docker._command[0] == "docker": + print "yes" + elif docker._command[0] == "sudo": + print "sudo" + except Exception: + print "no" + + return + + def main(): parser = argparse.ArgumentParser(description="A Docker helper", usage="%s ..." % os.path.basename(sys.argv[0]))