diff mbox

[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 454: Bring in fetch_image changes.

Message ID 20111026110915.7635.80424.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Mattias Backman Oct. 26, 2011, 11:09 a.m. UTC 
Merge authors:
  James Tunnicliffe (dooferlad)
  Loïc Minier (lool)
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)
  https://code.launchpad.net/~dooferlad/linaro-image-tools/11.09_fetch_image_update/+merge/78275
  proposed by: James Tunnicliffe (dooferlad)
------------------------------------------------------------
revno: 454 [merge]
committer: Mattias Backman <mattias.backman@linaro.org>
branch nick: linaro-image-tools
timestamp: Wed 2011-10-26 13:07:43 +0200
message:
  Bring in fetch_image changes.
modified:
  linaro_image_tools/fetch_image.py
  linaro_image_tools/fetch_image_settings.yaml


--
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/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'])

=== modified file 'linaro_image_tools/fetch_image_settings.yaml'
--- linaro_image_tools/fetch_image_settings.yaml	2011-09-06 20:59:09 +0000
+++ linaro_image_tools/fetch_image_settings.yaml	2011-10-05 15:54:11 +0000
@@ -133,6 +133,8 @@ 
     - final
     '11.08':
     - final
+    '11.09':
+    - final
 
 platform: linaro-n
 repository: release