diff mbox

[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
State Accepted
Headers show

Commit Message

Mattias Backman Oct. 18, 2011, 9:16 a.m. UTC 
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 <mattias.backman@linaro.org>
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
diff mbox

Patch

=== 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=[],