Merge lp:~mabac/linaro-image-tools/qemu-version into lp:linaro-image-tools/11.11

[Mattias Backman]

Hi,

This branch adds printing the version of qemu-arm-static along with the l-i-t version with the --version option.

It seems that argparse strips \n from the version string so the output is currently unreadable. Please let me know what you'd like the output to be and I'll try to make it happen.

Another slight inconvenience is that qemu-arm-static doesn't have a --version option which is the reason for the not so obvious implementation. I run qemu-arm-static --version with stdout piped to head -n 1 to get the first line of output. Just using the stdout pipe from the first Popen call didn't work since it closes as the command fails.

Thanks,

Mattias

[James Westby (james-w)]

Heh, funny implementation of --version that is in qemu :-)

I don't think the output is unusable, so unless you can come up with
a way around that behaviour I think it can go in like this.

Thanks,

James

[Mattias Backman (mabac)]

On Wed, Oct 19, 2011 at 7:18 PM, James Westby <email address hidden> wrote:
> Heh, funny implementation of --version that is in qemu :-)
>
> I don't think the output is unusable, so unless you can come up with
> a way around that behaviour I think it can go in like this.

Ok, then I'll just land it and we can see if it's important enough
that we get bug reports on it. I don't think the --version option is
worth spending too much time on.

>
> Thanks,
>
> James
>
> --
> https://code.launchpad.net/~mabac/linaro-image-tools/qemu-version/+merge/79821
> You are the owner of lp:~mabac/linaro-image-tools/qemu-version.
>

=== modified file 'linaro_image_tools/media_create/__init__.py'
--- linaro_image_tools/media_create/__init__.py	2011-10-12 13:44:12 +0000
+++ linaro_image_tools/media_create/__init__.py	2011-10-19 14:21:33 +0000
@@ -18,7 +18,10 @@
 # along with Linaro Image Tools.  If not, see <http://www.gnu.org/licenses/>.
 
 import argparse
+import subprocess
+import os
 
+from linaro_image_tools import cmd_runner
 from linaro_image_tools.media_create.boards import board_configs
 from linaro_image_tools.media_create.android_boards import android_board_configs
 from linaro_image_tools.__version__ import __version__
@@ -46,9 +49,26 @@
         setattr(namespace, 'is_live', True)
 
 
+def get_version():
+    qemu_path = '/usr/bin/qemu-arm-static'
+    p = cmd_runner.run(["head", "-n", "1"],
+                       stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+    if os.path.exists(qemu_path):
+        try:
+            # qemu-arm-static has no --version option so it fails,
+            # but still prints its version plus usage
+            cmd_runner.run(["/usr/bin/qemu-arm-static", "--version"],
+                           stdout=p.stdin).communicate()
+            p.communicate()
+        except:
+            qemu_version = p.stdout.read()
+    else:
+        qemu_version = "Cannot find %s." % qemu_path
+    return "%s\n: %s" % (__version__, qemu_version)
+
 def get_args_parser():
     """Get the ArgumentParser for the arguments given on the command line."""
-    parser = argparse.ArgumentParser(version='%(prog)s ' + __version__)
+    parser = argparse.ArgumentParser(version='%(prog)s ' + get_version())
     group = parser.add_mutually_exclusive_group(required=True)
     group.add_argument(
         '--mmc', dest='device', help='The storage device to use.')
@@ -129,7 +149,7 @@
 
 def get_android_args_parser():
     """Get the ArgumentParser for the arguments given on the command line."""
-    parser = argparse.ArgumentParser(version='%(prog)s ' + __version__)
+    parser = argparse.ArgumentParser(version='%(prog)s ' + get_version())
     group = parser.add_mutually_exclusive_group(required=True)
     group.add_argument(
         '--mmc', dest='device', help='The storage device to use.')