From patchwork Thu Oct 20 16:43:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Tunnicliffe X-Patchwork-Id: 4752 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 1335C23DE2 for ; Thu, 20 Oct 2011 16:43:16 +0000 (UTC) Received: from mail-bw0-f52.google.com (mail-bw0-f52.google.com [209.85.214.52]) by fiordland.canonical.com (Postfix) with ESMTP id F04BCA18182 for ; Thu, 20 Oct 2011 16:43:15 +0000 (UTC) Received: by bkbzs2 with SMTP id zs2so5236387bkb.11 for ; Thu, 20 Oct 2011 09:43:15 -0700 (PDT) Received: by 10.223.77.71 with SMTP id f7mr19147426fak.33.1319128995636; Thu, 20 Oct 2011 09:43:15 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.1.71 with SMTP id 7cs129125lak; Thu, 20 Oct 2011 09:43:15 -0700 (PDT) Received: by 10.14.10.196 with SMTP id 44mr1371955eev.112.1319128994855; Thu, 20 Oct 2011 09:43:14 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id t59si7436319weq.103.2011.10.20.09.43.14 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 20 Oct 2011 09:43:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1RGvi6-0002Xf-Bp for ; Thu, 20 Oct 2011 16:43:14 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 50BA5FB509 for ; Thu, 20 Oct 2011 16:43:14 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: linaro-image-tools X-Launchpad-Branch: ~linaro-image-tools/linaro-image-tools/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 453 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 453: Updating fetch image library to match new linaro media create command line. Message-Id: <20111020164314.17437.41593.launchpad@ackee.canonical.com> Date: Thu, 20 Oct 2011 16:43:14 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14165"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: fd1eea575bfdafbd036657a631825aadbf4d2b45 Merge authors: James Tunnicliffe (dooferlad) Related merge proposals: https://code.launchpad.net/~dooferlad/linaro-image-tools/fetch-image_use_new_lmc_params/+merge/79971 proposed by: James Tunnicliffe (dooferlad) review: Approve - James Westby (james-w) ------------------------------------------------------------ revno: 453 [merge] committer: James Tunnicliffe branch nick: linaro-image-tools timestamp: Thu 2011-10-20 17:41:10 +0100 message: Updating fetch image library to match new linaro media create command line. modified: linaro_image_tools/fetch_image.py --- lp:linaro-image-tools https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk You are subscribed to branch lp:linaro-image-tools. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk/+edit-subscription === modified file 'linaro_image_tools/fetch_image.py' --- linaro_image_tools/fetch_image.py 2011-08-22 17:04:07 +0000 +++ linaro_image_tools/fetch_image.py 2011-10-20 15:00:06 +0000 @@ -597,12 +597,12 @@ "specify either an image file, or an mmc target, not both.") self.append_setting_to(args, settings, 'mmc') - self.append_setting_to(args, settings, 'image_file') - self.append_setting_to(args, settings, 'image_size') - self.append_setting_to(args, settings, 'swap_size') - self.append_setting_to(args, settings, 'swap_file') + self.append_setting_to(args, settings, 'image_file', '--image-file') + self.append_setting_to(args, settings, 'image_size', '--image-size') + self.append_setting_to(args, settings, 'swap_size', '--swap-size') + self.append_setting_to(args, settings, 'swap_file', '--swap-file') self.append_setting_to(args, settings, 'yes_to_mmc_selection', - '--nocheck_mmc') + '--nocheck-mmc') args.append("--dev") args.append(settings['hardware'])