From 39a984550f1d478ff49f7a189ec776761c7f2ce5 Mon Sep 17 00:00:00 2001 From: Doug Zongker Date: Fri, 3 Sep 2010 14:15:34 -0700 Subject: [PATCH] return to using subprocess for running commands Reverts Ic4f1c747 and fixes the problem by splitting the extra_flags argument (it wasn't working before because it was getting one argument "-c 4096 -s 128" instead of four arguments "-c", "4096", "-s", "128" and mkyaffs2image apparently just ignores that bogus argument?) Change-Id: Ib1e08d634aa68bfab0f7e09680d407f2cee0797d --- tools/releasetools/img_from_target_files | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/tools/releasetools/img_from_target_files b/tools/releasetools/img_from_target_files index 9bf373c11..07eb6487c 100755 --- a/tools/releasetools/img_from_target_files +++ b/tools/releasetools/img_from_target_files @@ -126,19 +126,13 @@ def AddSystem(output_zip): else: build_command = ["mkyaffs2image", "-f"] if OPTIONS.mkyaffs2_extra_flags is not None: - build_command.append(OPTIONS.mkyaffs2_extra_flags); + build_command.extend(OPTIONS.mkyaffs2_extra_flags.split()); build_command.append(os.path.join(OPTIONS.input_tmp, "system")) build_command.append(img.name) - # p = common.Run(build_command) - # p.communicate() - # assert p.returncode == 0, "build system.img image failed" - - # TODO: Why the above common.Run() generate different system.img for crespo? - str_command = " ".join(build_command) - print "running " + str_command - exit_code = os.system(str_command) - assert exit_code == 0, "build system.img image failed" + p = common.Run(build_command) + p.communicate() + assert p.returncode == 0, "build system.img image failed" img.seek(os.SEEK_SET, 0) data = img.read()