From patchwork Tue Oct 18 09:16:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mattias Backman X-Patchwork-Id: 4724 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 051E523DE2 for ; Tue, 18 Oct 2011 09:23:29 +0000 (UTC) Received: from mail-dy0-f52.google.com (mail-dy0-f52.google.com [209.85.220.52]) by fiordland.canonical.com (Postfix) with ESMTP id E1093A1857E for ; Tue, 18 Oct 2011 09:23:28 +0000 (UTC) Received: by dyj16 with SMTP id 16so6626dyj.11 for ; Tue, 18 Oct 2011 02:23:28 -0700 (PDT) Received: by 10.223.17.3 with SMTP id q3mr2838005faa.28.1318929808585; Tue, 18 Oct 2011 02:23:28 -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 7cs36960lak; Tue, 18 Oct 2011 02:23:28 -0700 (PDT) Received: by 10.227.197.194 with SMTP id el2mr584116wbb.41.1318929807583; Tue, 18 Oct 2011 02:23:27 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id es15si910526wbb.78.2011.10.18.02.23.27 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 18 Oct 2011 02:23:27 -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 1RG5tP-0006tx-1q for ; Tue, 18 Oct 2011 09:23:27 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 8CC62E09F6 for ; Tue, 18 Oct 2011 09:16:17 +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: 449 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 449: Add l-m-c and l-a-m-c command line parameters using dashes for consistency. Message-Id: <20111018091617.26206.95260.launchpad@ackee.canonical.com> Date: Tue, 18 Oct 2011 09:16:17 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14157"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 092a301cafce9747e78fce9ec10dcc89c175fbd0 Merge authors: Mattias Backman (mabac) Related merge proposals: https://code.launchpad.net/~mabac/linaro-image-tools/bug-863091-cmdline-options/+merge/79096 proposed by: Mattias Backman (mabac) review: Approve - James Westby (james-w) ------------------------------------------------------------ revno: 449 [merge] committer: Mattias Backman branch nick: linaro-image-tools timestamp: Tue 2011-10-18 11:13:03 +0200 message: Add l-m-c and l-a-m-c command line parameters using dashes for consistency. modified: linaro_image_tools/media_create/__init__.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/media_create/__init__.py' --- linaro_image_tools/media_create/__init__.py 2011-10-03 08:18:45 +0000 +++ linaro_image_tools/media_create/__init__.py 2011-10-12 13:44:12 +0000 @@ -53,7 +53,7 @@ group.add_argument( '--mmc', dest='device', help='The storage device to use.') group.add_argument( - '--image_file', dest='device', + '--image-file', '--image_file', dest='device', help='File where we should write the QEMU image.') parser.add_argument( '--dev', required=True, dest='board', choices=KNOWN_BOARDS, @@ -62,13 +62,13 @@ '--rootfs', default='ext4', choices=['ext2', 'ext3', 'ext4', 'btrfs'], help='Type of filesystem to use for the rootfs') parser.add_argument( - '--rfs_label', default='rootfs', + '--rfs-label', '--rfs_label', default='rootfs', help='Label to use for the root filesystem.') parser.add_argument( - '--boot_label', default='boot', + '--boot-label', '--boot_label', default='boot', help='Label to use for the boot filesystem.') parser.add_argument( - '--swap_file', type=int, + '--swap-file', '--swap_file', type=int, help='Create a swap file of the given size (in MBs).') group = parser.add_mutually_exclusive_group() group.add_argument( @@ -97,7 +97,7 @@ '--hwpack-force-yes', action='store_true', help='Pass --force-yes to linaro-hwpack-install') parser.add_argument( - '--image_size', default='3G', + '--image-size', '--image_size', default='3G', help=('The image size, specified in mega/giga bytes (e.g. 3000M or ' '3G); use with --image_file only')) parser.add_argument( @@ -134,17 +134,17 @@ group.add_argument( '--mmc', dest='device', help='The storage device to use.') group.add_argument( - '--image_file', dest='device', + '--image-file', '--image_file', dest='device', help='File where we should write the image file.') parser.add_argument( - '--image_size', default='2G', + '--image-size', '--image_size', default='2G', help=('The image size, specified in mega/giga bytes (e.g. 3000M or ' '3G); use with --image_file only')) parser.add_argument( '--dev', required=True, dest='board', choices=ANDROID_KNOWN_BOARDS, help='Generate an SD card or image for the given board.') parser.add_argument( - '--boot_label', default='boot', + '--boot-label', '--boot_label', default='boot', help='Label to use for the boot filesystem.') parser.add_argument( '--console', action='append', dest='consoles', default=[],