From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37766) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dNguv-0006j6-ES for qemu-devel@nongnu.org; Wed, 21 Jun 2017 10:47:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dNgus-00050p-2b for qemu-devel@nongnu.org; Wed, 21 Jun 2017 10:47:37 -0400 Received: from mail-wr0-x229.google.com ([2a00:1450:400c:c0c::229]:33277) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dNgur-000509-Sj for qemu-devel@nongnu.org; Wed, 21 Jun 2017 10:47:34 -0400 Received: by mail-wr0-x229.google.com with SMTP id r103so138114904wrb.0 for ; Wed, 21 Jun 2017 07:47:33 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Wed, 21 Jun 2017 15:47:55 +0100 Message-Id: <20170621144814.15324-3-alex.bennee@linaro.org> In-Reply-To: <20170621144814.15324-1-alex.bennee@linaro.org> References: <20170621144814.15324-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PULL 02/21] docker: let _copy_with_mkdir() sub_path argument be optional List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Fam Zheng From: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Signed-off-by: Alex Bennée diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 8747f6a440..6ddc6e4c2a 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -52,7 +52,7 @@ def _guess_docker_command(): raise Exception("Cannot find working docker command. Tried:\n%s" % \ commands_txt) -def _copy_with_mkdir(src, root_dir, sub_path): +def _copy_with_mkdir(src, root_dir, sub_path='.'): """Copy src into root_dir, creating sub_path as needed.""" dest_dir = os.path.normpath("%s/%s" % (root_dir, sub_path)) try: -- 2.13.0