Merge lp:~dooferlad/linaro-fetch-image/android-params into lp:linaro-fetch-image

[James Tunnicliffe]

Minor update to make build and hwpack parameters optional when android is the specified image type.
Make build default to "final" when fetching a release build (it is the only valid option at the moment).

[Deepti B. Kalakeri (deeptik)]

looks good +1.

review: Approve

[Milo Casagrande (milo)]

Hi James, looks good to me.
+1

review: Approve

=== modified file 'linaro_fetch_image/fetch_image.py'
--- linaro_fetch_image/fetch_image.py	2012-10-10 15:42:01 +0000
+++ linaro_fetch_image/fetch_image.py	2012-10-11 10:09:22 +0000
@@ -871,11 +871,16 @@
 
         choices = self.settings['UI']['descriptions']['choice'].items()
         for (key, value) in choices:
+            # We don't require hwpack and build for android builds, so don't
+            # make them required here.
+            required = True
+            if key in ["hwpack", "build"]:
+                required = False
             parser.add_argument(
                        "-" + self.settings['UI']['cmdline short names'][key],
                        "--" + key,
                        help=self.settings['UI']['descriptions']['choice'][key],
-                       required=True)
+                       required=required)
 
         parser.add_argument("-x", "--clean-cache",
                             help="Delete all cached downloads",
@@ -902,6 +907,20 @@
 
         self.args = vars(parser.parse_args(args))
 
+        # build defaults to final for release builds (it is, in general,
+        # the only option)
+        if self.args["platform"] != "snapshot" and not self.args["build"]:
+            self.args["build"] = "final"
+
+        # hwpack and build are required for non-android configurations
+        if(self.args["image"] != "android" and
+           not (self.args["hwpack"] and self.args["build"])):
+            logging.error(
+                "For Ubuntu based images hwpack and build are required "
+                "parameters.")
+            parser.print_help()
+            exit(1)
+
     def finish_config(self, db):
         """Fill in settings derived from the database."""
         self.settings['choice']['platform'] = {}

=== modified file 'linaro_fetch_image/fetch_image_settings.yaml'
--- linaro_fetch_image/fetch_image_settings.yaml	2012-10-10 15:42:01 +0000
+++ linaro_fetch_image/fetch_image_settings.yaml	2012-10-11 10:09:22 +0000
@@ -3,11 +3,11 @@
     alip: ARM Internet Platform
     choice:
       build: The build (alpha-1 / beta / final) or date of snapshot (YYYYMMDD:build_number or 'latest')
-        to fetch.
+        to fetch. For non-snapshot builds, defaults to final.
       hardware: The board you are building the image to run on.
       hwpack: The hardware pack to use when building the image.
-      image: A distribuion image, e.g. ubuntu-desktop.
-      platform: Which Linaro platform to build an image from. Specify 'snapshot' to
+      image: A distribuion image, such as ubuntu-desktop, android or nano.
+      platform: Which Linaro platform to build an image from (for example, 12.04). Specify 'snapshot' to
         use a snapshot rather than a release.
     developer: Developer Tools
     o-developer: Developer Tools