Merge lp:~salgado/linaro-image-tools/remove-unneeded-code into lp:linaro-image-tools/11.11

[Guilherme Salgado]

We used to unpack the binary tarball on the current working dir so we had some
code to remove any directory named 'binary' under the current working
directory before unpacking. As we now unpack it on a temp dir which is removed
when the script exits, we no longer need that code.

[James Westby (james-w)]

review: Approve

=== modified file 'linaro-media-create'
--- linaro-media-create	2011-01-13 00:00:49 +0000
+++ linaro-media-create	2011-01-14 20:39:08 +0000
@@ -19,7 +19,6 @@
     setup_partitions,
     )
 from linaro_media_create.populate_boot import populate_boot
-from linaro_media_create.remove_binary_dir import remove_dir
 from linaro_media_create.rootfs import populate_rootfs
 from linaro_media_create.unpack_binary_tarball import unpack_binary_tarball
 from linaro_media_create import get_args_parser
@@ -85,8 +84,6 @@
         # All good, move on.
         pass
 
-    # TODO: Combine these two into a single function.
-    remove_dir(ROOTFS_DIR)
     unpack_binary_tarball(args.binary, TMP_DIR)
 
     hwpacks = args.hwpacks

=== removed file 'linaro_media_create/remove_binary_dir.py'
--- linaro_media_create/remove_binary_dir.py	2011-01-11 21:26:54 +0000
+++ linaro_media_create/remove_binary_dir.py	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-import os.path
-
-from linaro_media_create import cmd_runner
-
-
-def remove_dir(directory, as_root=True):
-    if os.path.exists(directory):
-        proc = cmd_runner.run(['rm', '-rf', directory], as_root=as_root)
-        proc.wait()
-        return proc.returncode
-    return 0

=== modified file 'linaro_media_create/tests/test_media_create.py'
--- linaro_media_create/tests/test_media_create.py	2011-01-13 00:00:49 +0000
+++ linaro_media_create/tests/test_media_create.py	2011-01-14 20:39:08 +0000
@@ -49,7 +49,6 @@
     run_sfdisk_commands,
     setup_partitions,
     )
-from linaro_media_create.remove_binary_dir import remove_dir
 from linaro_media_create.rootfs import (
     create_flash_kernel_config,
     has_space_left_for_swap,
@@ -153,21 +152,6 @@
         self.assertEqual(expected, boot_cmd)
 
 
-class TestRemoveBinaryDir(TestCaseWithFixtures):
-
-    def setUp(self):
-        super(TestRemoveBinaryDir, self).setUp()
-        self.temp_dir_fixture = CreateTempDirFixture()
-        self.useFixture(self.temp_dir_fixture)
-
-    def test_remove_dir(self):
-        rc = remove_dir(
-            self.temp_dir_fixture.get_temp_dir(), as_root=False)
-        self.assertEqual(rc, 0)
-        self.assertFalse(
-            os.path.exists(self.temp_dir_fixture.get_temp_dir()))
-
-
 class TestUnpackBinaryTarball(TestCaseWithFixtures):
 
     def setUp(self):